# HG changeset patch
# User bpittore
# Date 1391802424 18000
# Node ID 6c2348280d0996d844a7f6b2eafd86db4827a67a
# Parent  ab191bdb1dc9da722b13513d6d6425bfae7af25d# Parent  78871f5c479b452fe10698b09064a586cc5ac4a9
Merge

diff -r ab191bdb1dc9 -r 6c2348280d09 hotspot/src/share/vm/services/management.cpp
--- a/hotspot/src/share/vm/services/management.cpp	Fri Feb 07 09:41:36 2014 -0800
+++ b/hotspot/src/share/vm/services/management.cpp	Fri Feb 07 14:47:04 2014 -0500
@@ -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);