Author: mahadev
Date: Wed Mar 18 16:37:57 2009
New Revision: 755635

URL: http://svn.apache.org/viewvc?rev=755635&view=rev
Log:
ZOOKEEPER-341.  regression in QuorumPeerMain, tickTime from config is lost, 
cannot start quorum (phunt via mahadev)

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

Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=755635&r1=755634&r2=755635&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Wed Mar 18 16:37:57 2009
@@ -30,7 +30,10 @@
   (mahadev via phunt)
 
   ZOOKEEPER-309. core dump using zoo_get_acl() (mahadev via phunt)
- 
+
+  ZOOKEEPER-341.  regression in QuorumPeerMain, 
+  tickTime from config is lost, cannot start quorum (phunt via mahadev)
+
 IMPROVEMENTS:
   ZOOKEEPER-308. improve the atomic broadcast performance 3x.
   (breed via mahadev)

Modified: 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java?rev=755635&r1=755634&r2=755635&view=diff
==============================================================================
--- 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
 (original)
+++ 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
 Wed Mar 18 16:37:57 2009
@@ -34,7 +34,6 @@
 public class QuorumPeerConfig extends ServerConfig {
     private static final Logger LOG = Logger.getLogger(QuorumPeerConfig.class);
 
-    private int tickTime;
     private int initLimit;
     private int syncLimit;
     private int electionAlg;
@@ -189,11 +188,6 @@
         return QuorumPeerConfig.getServers().size() <= 1;
     }
 
-    public static int getTickTime() {
-        assert instance instanceof QuorumPeerConfig;
-        return ((QuorumPeerConfig)instance).tickTime;
-    }
-
     public static int getInitLimit() {
         assert instance instanceof QuorumPeerConfig;
         return ((QuorumPeerConfig)instance).initLimit;


Reply via email to