[jboss-cvs] JBossAS SVN: r64035 - in trunk: jmx/src/main/org/jboss/mx/loading and 1 other directories.

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

Author: adrian at jboss.org
Date: 2007-07-13 10:53:54 -0400 (Fri, 13 Jul 2007)
New Revision: 64035

Modified:
   trunk/j2se/src/main/org/jboss/mx/loading/RepositoryClassLoader.java
   trunk/jmx/src/main/org/jboss/mx/loading/MLetRepositoryClassLoader.java
   trunk/jmx/src/main/org/jboss/mx/loading/UnifiedClassLoader.java
   trunk/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java
Log:
[JBMICROCONT-182] - Use RealClassLoader for JMX related tasks on classloading.

Modified: trunk/j2se/src/main/org/jboss/mx/loading/RepositoryClassLoader.java
===================================================================
--- trunk/j2se/src/main/org/jboss/mx/loading/RepositoryClassLoader.java	2007-07-13 14:42:02 UTC (rev 64034)
+++ trunk/j2se/src/main/org/jboss/mx/loading/RepositoryClassLoader.java	2007-07-13 14:53:54 UTC (rev 64035)
@@ -126,7 +126,7 @@
     * 
     * @return the object name
     */
-   public abstract ObjectName getObjectName() throws MalformedObjectNameException;
+   public abstract ObjectName getObjectName();
    
    /**
     * Get the loader repository for this classloader

Modified: trunk/jmx/src/main/org/jboss/mx/loading/MLetRepositoryClassLoader.java
===================================================================
--- trunk/jmx/src/main/org/jboss/mx/loading/MLetRepositoryClassLoader.java	2007-07-13 14:42:02 UTC (rev 64034)
+++ trunk/jmx/src/main/org/jboss/mx/loading/MLetRepositoryClassLoader.java	2007-07-13 14:53:54 UTC (rev 64035)
@@ -23,7 +23,6 @@
 
 import java.net.URL;
 
-import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.management.loading.MLet;
 
@@ -70,7 +69,7 @@
     * 
     * @return the object name
     */
-   public ObjectName getObjectName() throws MalformedObjectNameException
+   public ObjectName getObjectName()
    {
       throw new UnsupportedOperationException("Not relevent");
    }

Modified: trunk/jmx/src/main/org/jboss/mx/loading/UnifiedClassLoader.java
===================================================================
--- trunk/jmx/src/main/org/jboss/mx/loading/UnifiedClassLoader.java	2007-07-13 14:42:02 UTC (rev 64034)
+++ trunk/jmx/src/main/org/jboss/mx/loading/UnifiedClassLoader.java	2007-07-13 14:53:54 UTC (rev 64035)
@@ -30,10 +30,10 @@
 import java.util.Enumeration;
 
 import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
 import org.jboss.logging.Logger;
+import org.jboss.mx.util.ObjectNameFactory;
 import org.jboss.util.loading.Translatable;
 
 /**
@@ -186,10 +186,10 @@
     JMX server. This creates a name of the form "jmx.loading:UCL=hashCode"
     since we don't currently care that UCL be easily queriable.
     */
-   public ObjectName getObjectName() throws MalformedObjectNameException
+   public ObjectName getObjectName()
    {
       String name = "jmx.loading:UCL="+Integer.toHexString(super.hashCode());
-      return new ObjectName(name);
+      return ObjectNameFactory.create(name);
    }
 
    public void unregister()

Modified: trunk/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java
===================================================================
--- trunk/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java	2007-07-13 14:42:02 UTC (rev 64034)
+++ trunk/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java	2007-07-13 14:53:54 UTC (rev 64035)
@@ -51,6 +51,8 @@
 
 import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
 import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
+
+import org.jboss.classloading.spi.RealClassLoader;
 import org.jboss.logging.Logger;
 import org.jboss.mx.loading.LoaderRepository;
 import org.jboss.mx.loading.RepositoryClassLoader;
@@ -440,7 +442,7 @@
      */
     protected void registerClassLoader(ClassLoader cl)
     {
-       if( (cl instanceof RepositoryClassLoader) == false )
+       if( (cl instanceof RealClassLoader) == false )
        {
          // Only register non-UCLs as UCLs already have a repository
          loaderRepository.addClassLoader(cl);