You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by br...@apache.org on 2012/09/25 07:13:27 UTC
svn commit: r1389711 - in /zookeeper/trunk/src/java:
main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
test/org/apache/zookeeper/server/util/DynamicConfigBCTest.java
Author: breed
Date: Tue Sep 25 05:13:27 2012
New Revision: 1389711
URL: http://svn.apache.org/viewvc?rev=1389711&view=rev
Log:
ZOOKEEPER-1411 breaks backwards compatibility (Andrew Ferguson via breed)
Modified:
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/util/DynamicConfigBCTest.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=1389711&r1=1389710&r2=1389711&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 Tue Sep 25 05:13:27 2012
@@ -446,7 +446,7 @@ public class QuorumPeerConfig {
&& clientPortAddress.getPort()!=qs.clientAddr.getPort()))
throw new ConfigException("client address for this server (id = " + serverId + ") in static config file is " + clientPortAddress + " is different from client address found in dynamic file: " + qs.clientAddr);
}
- if (qs!=null) clientPortAddress = qs.clientAddr;
+ if (qs!=null && qs.clientAddr != null) clientPortAddress = qs.clientAddr;
// Warn about inconsistent peer type
LearnerType roleByServersList = quorumVerifier.getObservingMembers().containsKey(serverId) ? LearnerType.OBSERVER
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/util/DynamicConfigBCTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/util/DynamicConfigBCTest.java?rev=1389711&r1=1389710&r2=1389711&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/util/DynamicConfigBCTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/util/DynamicConfigBCTest.java Tue Sep 25 05:13:27 2012
@@ -107,6 +107,9 @@ public class DynamicConfigBCTest extends
QuorumPeerConfig config = new QuorumPeerConfig();
config.parse(confFile.toString());
+ Assert.assertTrue(config.getClientPortAddress() != null
+ && config.getClientPortAddress().getPort() == CLIENT_PORT_QP1);
+
setDynamicConfigFilename(config.getDynamicConfigFilename());
setConfigFileName(config.getConfigFilename());
setConfigBackwardCompatibility(config.getConfigBackwardCompatibility());