# HG changeset patch
# User jiangli
# Date 1395783196 14400
# Node ID fe4ad1b6553003508aa489b97d5e992b4c507001
# Parent  55fbc11353ecf605c004e199f6d6e14f92d5c178# Parent  6c2348280d0996d844a7f6b2eafd86db4827a67a
Merge

diff -r 55fbc11353ec -r fe4ad1b65530 hotspot/src/share/vm/services/management.cpp
--- a/hotspot/src/share/vm/services/management.cpp	Fri Mar 21 09:11:56 2014 +0100
+++ b/hotspot/src/share/vm/services/management.cpp	Tue Mar 25 17:33:16 2014 -0400
@@ -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);