tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1242370 - /tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
Date Thu, 09 Feb 2012 16:07:48 GMT
Author: markt
Date: Thu Feb  9 16:07:47 2012
New Revision: 1242370

URL: http://svn.apache.org/viewvc?rev=1242370&view=rev
Log:
Remove JMX registration of removed StandardClassLoader (note no
attributes or methods were exposed anyway).

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=1242370&r1=1242369&r2=1242370&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java Thu Feb  9 16:07:47 2012
@@ -14,14 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.startup;
 
-
 import java.io.File;
 import java.io.IOException;
-import java.lang.management.ManagementFactory;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
@@ -30,10 +26,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.ObjectName;
-
 import org.apache.catalina.Globals;
 import org.apache.catalina.security.SecurityClassLoad;
 import org.apache.catalina.startup.ClassLoaderFactory.Repository;
@@ -55,7 +47,6 @@ import org.apache.juli.logging.LogFactor
  * @author Remy Maucherat
  * @version $Id$
  */
-
 public final class Bootstrap {
 
     private static final Log log = LogFactory.getLog(Bootstrap.class);
@@ -214,24 +205,7 @@ public final class Bootstrap {
             }
         }
 
-        ClassLoader classLoader = ClassLoaderFactory.createClassLoader
-            (repositories, parent);
-
-        // Retrieving MBean server
-        MBeanServer mBeanServer = null;
-        if (MBeanServerFactory.findMBeanServer(null).size() > 0) {
-            mBeanServer = MBeanServerFactory.findMBeanServer(null).get(0);
-        } else {
-            mBeanServer = ManagementFactory.getPlatformMBeanServer();
-        }
-
-        // Register the server classloader
-        ObjectName objectName =
-            new ObjectName("Catalina:type=ServerClassLoader,name=" + name);
-        mBeanServer.registerMBean(classLoader, objectName);
-
-        return classLoader;
-
+        return ClassLoaderFactory.createClassLoader(repositories, parent);
     }
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message