svn commit: r1702157 - in /zookeeper/branches/branch-3.4: CHANGES.txt src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java

[rg...@apache.org]

Author: rgs
Date: Thu Sep 10 04:12:05 2015
New Revision: 1702157

URL: http://svn.apache.org/r1702157
Log:
ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests
(Jordan Zimmerman via rgs)

Modified:
    zookeeper/branches/branch-3.4/CHANGES.txt
    zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1702157&r1=1702156&r2=1702157&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Thu Sep 10 04:12:05 2015
@@ -144,6 +144,9 @@ IMPROVEMENTS:
   ZOOKEEPER-1907 Improve Thread handling
   (Rakesh R via hdeng)
 
+  ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests
+  (Jordan Zimmerman via rgs)
+
 NEW FEATURES:
 
   ZOOKEEPER-2237 Port async multi to 3.4 branch (Ivan Kelly via rakeshr)

Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java?rev=1702157&r1=1702156&r2=1702157&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java (original)
+++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java Thu Sep 10 04:12:05 2015
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
 public class MBeanRegistry {
     private static final Logger LOG = LoggerFactory.getLogger(MBeanRegistry.class);
     
-    private static MBeanRegistry instance = new MBeanRegistry(); 
+    private static volatile MBeanRegistry instance = new MBeanRegistry();
     
     private Map<ZKMBeanInfo, String> mapBean2Path =
         new ConcurrentHashMap<ZKMBeanInfo, String>();
@@ -50,6 +50,10 @@ public class MBeanRegistry {
 
     private MBeanServer mBeanServer;
 
+    public static void setInstance(MBeanRegistry instance) {
+        MBeanRegistry.instance = instance;
+    }
+
     public static MBeanRegistry getInstance() {
         return instance;
     }