Merge
authordsamersoff
Thu, 27 Mar 2014 03:14:45 -0700
changeset 23484 b9e6597aa718
parent 23478 fe4ad1b65530 (diff)
parent 23483 0130945560ee (current diff)
child 23500 4d2c3e2dc910
Merge
--- a/hotspot/src/share/vm/services/management.cpp	Mon Mar 24 11:51:40 2014 -0700
+++ b/hotspot/src/share/vm/services/management.cpp	Thu Mar 27 03:14:45 2014 -0700
@@ -152,11 +152,14 @@
     // Load and initialize the sun.management.Agent class
     // invoke startAgent method to start the management server
     Handle loader = Handle(THREAD, SystemDictionary::java_system_loader());
-    Klass* k = SystemDictionary::resolve_or_fail(vmSymbols::sun_management_Agent(),
+    Klass* k = SystemDictionary::resolve_or_null(vmSymbols::sun_management_Agent(),
                                                    loader,
                                                    Handle(),
-                                                   true,
-                                                   CHECK);
+                                                   THREAD);
+    if (k == NULL) {
+      vm_exit_during_initialization("Management agent initialization failure: "
+          "class sun.management.Agent not found.");
+    }
     instanceKlassHandle ik (THREAD, k);
 
     JavaValue result(T_VOID);