Author: markt
Date: Mon Feb 23 22:30:24 2015
New Revision: 1661804
URL: http://svn.apache.org/r1661804
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57625
Clean-up
Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1661804&r1=1661803&r2=1661804&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Mon Feb 23
22:30:24 2015
@@ -428,25 +428,23 @@ public class Registry implements Registr
/**
* Factory method to create (if necessary) and return our
* <code>MBeanServer</code> instance.
- *
*/
public synchronized MBeanServer getMBeanServer() {
- long t1=System.currentTimeMillis();
-
if (server == null) {
- if( MBeanServerFactory.findMBeanServer(null).size() > 0 ) {
+ long t1 = System.currentTimeMillis();
+ if (MBeanServerFactory.findMBeanServer(null).size() > 0) {
server = MBeanServerFactory.findMBeanServer(null).get(0);
- if( log.isDebugEnabled() ) {
- log.debug("Using existing MBeanServer " +
(System.currentTimeMillis() - t1 ));
+ if (log.isDebugEnabled()) {
+ log.debug("Using existing MBeanServer " +
(System.currentTimeMillis() - t1));
}
} else {
server = ManagementFactory.getPlatformMBeanServer();
- if( log.isDebugEnabled() ) {
- log.debug("Creating MBeanServer"+
(System.currentTimeMillis() - t1 ));
+ if (log.isDebugEnabled()) {
+ log.debug("Creating MBeanServer" +
(System.currentTimeMillis() - t1));
}
}
}
- return (server);
+ return server;
}
/** Find or load metadata.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
