From 7c7d14b2ca9c9b79f9bfd29fdc13c34700d52dfa Mon Sep 17 00:00:00 2001
From: costin <costin@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 18 Jul 2008 14:11:03 +0000
Subject: [PATCH] This was discussed a month ago - didn't hear any objections.
 It uses the 'platform' mbean server instead of a new one if none was
 explicitely created. This allows using jconsole without any flags - without
 the change it would only show platform mbeans, now it has tomcat mbeans as
 well.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@677910 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/startup/Bootstrap.java   | 3 ++-
 java/org/apache/tomcat/util/modeler/Registry.java | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/startup/Bootstrap.java b/java/org/apache/catalina/startup/Bootstrap.java
index b775f0aba..2e6933f35 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -20,6 +20,7 @@ package org.apache.catalina.startup;
 
 
 import java.io.File;
+import java.lang.management.ManagementFactory;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -179,7 +180,7 @@ public final class Bootstrap {
             mBeanServer =
                 (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
         } else {
-            mBeanServer = MBeanServerFactory.createMBeanServer();
+            mBeanServer = ManagementFactory.getPlatformMBeanServer();
         }
 
         // Register the server classloader
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java b/java/org/apache/tomcat/util/modeler/Registry.java
index b02b5575b..5e95f1f00 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.util.modeler;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.lang.management.ManagementFactory;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -593,7 +594,7 @@ public class Registry implements RegistryMBean, MBeanRegistration  {
                     log.debug("Using existing MBeanServer " + (System.currentTimeMillis() - t1 ));
                 }
             } else {
-                server=MBeanServerFactory.createMBeanServer();
+                server = ManagementFactory.getPlatformMBeanServer();
                 if( log.isDebugEnabled() ) {
                     log.debug("Creating MBeanServer"+ (System.currentTimeMillis() - t1 ));
                 }
-- 
2.11.0