zookeeper-commits mailing list archives

Author: michim
Date: Mon Apr  1 23:01:06 2013
New Revision: 1463329

URL: http://svn.apache.org/r1463329
Log:
ZOOKEEPER-1411. Consolidate membership management, distinguish between static and dynamic
configuration parameters. A small bug fix.

Modified:
    zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java

Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java?rev=1463329&r1=1463328&r2=1463329&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
(original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
Mon Apr  1 23:01:06 2013
@@ -225,7 +225,7 @@ public class QuorumPeerConfig {
                 snapRetainCount = Integer.parseInt(value);
             } else if (key.equals("autopurge.purgeInterval")) {
                 purgeInterval = Integer.parseInt(value);
-            } else if ((key.startsWith("server.") || key.startsWith("group") || key.startsWith("weight"))
&& zkProp.entrySet().contains("dynamicConfigFile")){                
+            } else if ((key.startsWith("server.") || key.startsWith("group") || key.startsWith("weight"))
&& zkProp.containsKey("dynamicConfigFile")){                
                throw new ConfigException("parameter: " + key + " must be in a separate dynamic
config file");
             } else {
                 System.setProperty("zookeeper." + key, value);