svn commit: r1157690 - in /zookeeper/trunk: CHANGES.txt src/java/test/org/apache/zookeeper/test/QuorumTest.java

[ma...@apache.org]

Author: mahadev
Date: Mon Aug 15 00:54:09 2011
New Revision: 1157690

URL: http://svn.apache.org/viewvc?rev=1157690&view=rev
Log:
ZOOKEEPER-1104. CLONE - In QuorumTest, use the same "for ( .. try { break } catch { } )" pattern in testFollowersStartAfterLeaders as in testSessionMove. (Eugene Koontz via mahadev)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1157690&r1=1157689&r2=1157690&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Mon Aug 15 00:54:09 2011
@@ -383,6 +383,10 @@ IMPROVEMENTS:
 
   ZOOKEEPER-1143. quorum send & recv workers are missing thread names
   (phunt via mahadev)
+  
+  ZOOKEEPER-1104. CLONE - In QuorumTest, use the same "for ( .. try { break }
+  catch { } )" pattern in testFollowersStartAfterLeaders as in testSessionMove. 
+  (Eugene Koontz via mahadev)
 
 NEW FEATURES:
   ZOOKEEPER-729. Java client API to recursively delete a subtree.

Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java?rev=1157690&r1=1157689&r2=1157690&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java Mon Aug 15 00:54:09 2011
@@ -321,18 +321,14 @@ public class QuorumTest extends ZKTestCa
                         "127.0.0.1:" + qu.getPeer(2).clientPort,
                         CONNECTION_TIMEOUT));
 
-        boolean success = false;
         for (int i = 0; i < 30; i++) {
             try {
                 zk.create("/test", "test".getBytes(), ZooDefs.Ids.OPEN_ACL_UNSAFE,
                     CreateMode.PERSISTENT);
-                success = true;
                 break;
             } catch(KeeperException.ConnectionLossException e) {
                 Thread.sleep(1000);
             }
-        }
-        if (!success) {
             // test fails if we still can't connect to the quorum after 30 seconds.
             Assert.fail("client could not connect to reestablished quorum: giving up after 30+ seconds.");
         }