You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/06/22 01:51:47 UTC
svn commit: r1352728 -
/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java
Author: rmannibucau
Date: Thu Jun 21 23:51:46 2012
New Revision: 1352728
URL: http://svn.apache.org/viewvc?rev=1352728&view=rev
Log:
TOMEE-252 we save the server so we don't really need to try JMX
Modified:
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java
Modified: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java?rev=1352728&r1=1352727&r2=1352728&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java Thu Jun 21 23:51:46 2012
@@ -74,6 +74,10 @@ public class TomcatHelper {
TomcatHelper.server = server;
return server;
}
+
+ if (TomcatHelper.server != null) { // try it before next one otherwise we depend on "Catalina" name which can change
+ return TomcatHelper.server;
+ }
// if this fails, we'll try and get a reference from the platform mbean server
try {