You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2008/08/27 07:12:20 UTC

svn commit: r689359 - in /hadoop/zookeeper/trunk/src/java: Changes.txt main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java main/org/apache/zookeeper/server/quorum/FastLeaderElection.java

Author: mahadev
Date: Tue Aug 26 22:12:19 2008
New Revision: 689359

URL: http://svn.apache.org/viewvc?rev=689359&view=rev
Log:
ZOOKEEPER-125. Remove unwanted class declaration in FastLeaderElection. (Flavio Paiva Junqueira via mahadev)

Modified:
    hadoop/zookeeper/trunk/src/java/Changes.txt
    hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java
    hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java

Modified: hadoop/zookeeper/trunk/src/java/Changes.txt
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/Changes.txt?rev=689359&r1=689358&r2=689359&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/java/Changes.txt (original)
+++ hadoop/zookeeper/trunk/src/java/Changes.txt Tue Aug 26 22:12:19 2008
@@ -21,3 +21,6 @@
 
  ZOOKEEPER-2. Fix synchronization issues in QuorumPeer and FastLeader
  election. (Flavio Paiva Junqueira via mahadev)
+
+ ZOOKEEPER-125. Remove unwanted class declaration in FastLeaderElection. 
+ (Flavio Paiva Junqueira via mahadev)

Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java?rev=689359&r1=689358&r2=689359&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java (original)
+++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java Tue Aug 26 22:12:19 2008
@@ -727,16 +727,6 @@
         // recvqueue.clear();
     }
 
-    public static class ElectionResult {
-        public Vote vote;
-
-        public int count;
-
-        public Vote winner;
-
-        public int winningCount;
-    }
-
     private void sendNotifications() {
         for (QuorumServer server : self.quorumPeers) {
             InetSocketAddress saddr = new InetSocketAddress(server.addr

Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java?rev=689359&r1=689358&r2=689359&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java (original)
+++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java Tue Aug 26 22:12:19 2008
@@ -410,16 +410,6 @@
         recvqueue.clear();
     }
 
-    
-    public static class ElectionResult {
-        public Vote vote;
-
-        public int count;
-
-        public Vote winner;
-
-        public int winningCount;
-    }
 
     /**
      * Send notifications to all peers upon a change in our vote