diff options
| -rw-r--r-- | src/share/demo/jvmti/java_crw_demo/java_crw_demo.c | 4 | ||||
| -rw-r--r-- | test/demo/jvmti/hprof/HelloWorld.java | 2 | ||||
| -rw-r--r-- | test/demo/jvmti/hprof/StackMapTableTest.java | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c b/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c index 6d43d9baa9..d241e80daf 100644 --- a/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c +++ b/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c @@ -263,8 +263,8 @@ assert_error(CrwClassImage *ci, const char *condition, (void)sprintf(buf, "CRW ASSERTION FAILURE: %s (%s:%s:%d)", condition, - ci->name==0?"?":ci->name, - mi->name==0?"?":mi->name, + ci->name==NULL?"?":ci->name, + (mi==NULL||mi->name==NULL)?"?":mi->name, byte_code_offset); fatal_error(ci, buf, file, line); } diff --git a/test/demo/jvmti/hprof/HelloWorld.java b/test/demo/jvmti/hprof/HelloWorld.java index e349bbd08e..ae8ec5c148 100644 --- a/test/demo/jvmti/hprof/HelloWorld.java +++ b/test/demo/jvmti/hprof/HelloWorld.java @@ -24,7 +24,7 @@ /* HelloWorld: * - * Sample target appluication for HPROF tests + * Sample target application for HPROF tests * */ diff --git a/test/demo/jvmti/hprof/StackMapTableTest.java b/test/demo/jvmti/hprof/StackMapTableTest.java index a34614dfcc..0acc6fe61d 100644 --- a/test/demo/jvmti/hprof/StackMapTableTest.java +++ b/test/demo/jvmti/hprof/StackMapTableTest.java @@ -23,11 +23,11 @@ /* @test - * @bug 6266289 6299047 + * @bug 6266289 6299047 6855180 6855551 * @summary Test jvmti hprof and java_crw_demo with StackMapTable attributes * * @compile ../DemoRun.java - * @compile -source 1.6 -g:lines HelloWorld.java + * @compile -source 7 -g:lines HelloWorld.java * @build StackMapTableTest * @run main StackMapTableTest HelloWorld */ |