[jboss-cvs] JBossAS SVN: r69625 - trunk/system-jmx/src/main/org/jboss/system/deployers/managed.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2008-02-05 15:02:19 -0500 (Tue, 05 Feb 2008)
New Revision: 69625

Modified:
   trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java
Log:
Default to TCL if there is no mbeanServer

Modified: trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java	2008-02-05 17:03:43 UTC (rev 69624)
+++ trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java	2008-02-05 20:02:19 UTC (rev 69625)
@@ -75,7 +75,12 @@
    {
       try
       {
-         ClassLoader loader = mbeanServer.getClassLoader(md.getClassLoaderName());
+         // Fallback to TCL if there is no mbeanServer
+         ClassLoader loader = null;
+         if(mbeanServer != null)
+            loader = mbeanServer.getClassLoader(md.getClassLoaderName());
+         if(loader == null)
+            loader = Thread.currentThread().getContextClassLoader();
          Class moClass = loader.loadClass(md.getCode());
 
          // Looks for a ManagementObjectClass annotation that defines
@@ -88,7 +93,7 @@
             String anString = sam.getAnnotation();
             if (anString.startsWith(MOCLASS_ANNOTATION))
             {
-               Class originalClass = moClass;
+               Class<?> originalClass = moClass;
                ManagementObjectClass moc = (ManagementObjectClass)sam.getAnnotationInstance(loader);
                moClass = moc.code();
                log.debug("Using alternate class '" + moClass + "' for class " + originalClass);