svn commit: r1405859 - in /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb: config/ConfigurationFactory.java monitoring/LocalMBeanServer.java

[rmannibucau]

Author: rmannibucau
Date: Mon Nov  5 16:03:34 2012
New Revision: 1405859

URL: http://svn.apache.org/viewvc?rev=1405859&view=rev
Log:
resetting LocalMbeanServer#active value to be able to change it between server 
stop/start in the same jvm

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1405859&r1=1405858&r2=1405859&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 Mon Nov  5 16:03:34 2012
@@ -94,6 +94,7 @@ import org.apache.openejb.loader.FileUti
 import org.apache.openejb.loader.IO;
 import org.apache.openejb.loader.Options;
 import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.monitoring.LocalMBeanServer;
 import org.apache.openejb.resource.jdbc.DataSourceFactory;
 import org.apache.openejb.resource.jdbc.pool.DataSourceCreator;
 import org.apache.openejb.resource.jdbc.pool.DefaultDataSourceCreator;
@@ -146,6 +147,8 @@ public class ConfigurationFactory implem
         this.offline = offline;
         this.deploymentLoader = new DeploymentLoader();
 
+        LocalMBeanServer.reset();
+
         final Options options = SystemInstance.get().getOptions();
         if (SystemInstance.get().getComponent(DataSourceCreator.class) == 
null) {
             final String creator = 
options.get(OPENEJB_JDBC_DATASOURCE_CREATOR, (String) null);

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java?rev=1405859&r1=1405858&r2=1405859&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java
 Mon Nov  5 16:03:34 2012
@@ -48,18 +48,22 @@ public class LocalMBeanServer implements
     public static final String OPENEJB_JMX_ACTIVE = "openejb.jmx.active";
 
     private static final LocalMBeanServer INSTANCE = new LocalMBeanServer();
-    private static final boolean ACTIVE = 
SystemInstance.get().getOptions().get(OPENEJB_JMX_ACTIVE, false);
+    private static boolean active = 
SystemInstance.get().getOptions().get(OPENEJB_JMX_ACTIVE, false);
 
     private LocalMBeanServer() {
         // no-op
     }
 
+    public static void reset() {
+        active = SystemInstance.get().getOptions().get(OPENEJB_JMX_ACTIVE, 
false);
+    }
+
     public static MBeanServer get() {
         return INSTANCE;
     }
 
     public static boolean isJMXActive() {
-        return ACTIVE;
+        return active;
     }
 
     private static MBeanServer s() {