Merge
authorjiangli
Tue, 11 Nov 2014 19:42:52 +0000
changeset 27621 854d2d4d3077
parent 27617 9fe6503f11e8 (current diff)
parent 27620 c8cc69ab31e8 (diff)
child 27622 38913dc333ed
child 27650 199cbba2f8f9
child 27654 4e508c2376f7
Merge
--- a/hotspot/src/share/vm/classfile/classLoader.cpp	Tue Nov 11 18:00:06 2014 +0000
+++ b/hotspot/src/share/vm/classfile/classLoader.cpp	Tue Nov 11 19:42:52 2014 +0000
@@ -1120,7 +1120,7 @@
     h = context.record_result(classpath_index, e, result, THREAD);
   } else {
     if (DumpSharedSpaces) {
-      tty->print_cr("Preload Error: Cannot find %s", class_name);
+      tty->print_cr("Preload Warning: Cannot find %s", class_name);
     }
   }
 
--- a/hotspot/src/share/vm/classfile/dictionary.cpp	Tue Nov 11 18:00:06 2014 +0000
+++ b/hotspot/src/share/vm/classfile/dictionary.cpp	Tue Nov 11 19:42:52 2014 +0000
@@ -223,7 +223,7 @@
         }
         free_entry(probe);
         ResourceMark rm;
-        tty->print_cr("Removed error class: %s", ik->external_name());
+        tty->print_cr("Preload Warning: Removed error class: %s", ik->external_name());
         continue;
       }
 
--- a/hotspot/src/share/vm/memory/metaspaceShared.cpp	Tue Nov 11 18:00:06 2014 +0000
+++ b/hotspot/src/share/vm/memory/metaspaceShared.cpp	Tue Nov 11 19:42:52 2014 +0000
@@ -853,7 +853,7 @@
     ik->link_class(THREAD);
     if (HAS_PENDING_EXCEPTION) {
       ResourceMark rm;
-      tty->print_cr("Preload Error: Verification failed for %s",
+      tty->print_cr("Preload Warning: Verification failed for %s",
                     ik->external_name());
       CLEAR_PENDING_EXCEPTION;
       ik->set_in_error_state();