svn commit: r1236956 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java

[ma...@apache.org]

Author: markrmiller
Date: Sat Jan 28 02:03:29 2012
New Revision: 1236956

URL: http://svn.apache.org/viewvc?rev=1236956&view=rev
Log:
change test so that even if there is an exception in the ClientThread constructor, the zkclient is closed

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java?rev=1236956&r1=1236955&r2=1236956&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java Sat Jan 28 02:03:29 2012
@@ -55,8 +55,7 @@ public class LeaderElectionTest extends 
   
   @AfterClass
   public static void afterClass() throws InterruptedException {
-    // wait just a bit for any zk client threads to outlast timeout
-    Thread.sleep(2000);
+
   }
   
   @Override
@@ -87,10 +86,18 @@ public class LeaderElectionTest extends 
     
     public ClientThread(int nodeNumber) throws Exception {
       super("Thread-" + nodeNumber);
+      boolean created = false;
       this.zkClient = new SolrZkClient(server.getZkAddress(), TIMEOUT);
-      this.zkStateReader = new ZkStateReader(zkClient);
-      this.nodeNumber = nodeNumber;
-      props = new ZkNodeProps(ZkStateReader.BASE_URL_PROP, Integer.toString(nodeNumber), ZkStateReader.CORE_NAME_PROP, "");
+      try {
+        this.zkStateReader = new ZkStateReader(zkClient);
+        this.nodeNumber = nodeNumber;
+        props = new ZkNodeProps(ZkStateReader.BASE_URL_PROP, Integer.toString(nodeNumber), ZkStateReader.CORE_NAME_PROP, "");
+        created = true;
+      } finally {
+        if (!created) {
+          zkClient.close();
+        }
+      }
     }
     
     @Override
@@ -371,11 +378,11 @@ public class LeaderElectionTest extends 
     killThread.interrupt();
     
     scheduleThread.join();
+    scheduler.shutdownNow();
+    
     connLossThread.join();
     killThread.join();
     
-    scheduler.shutdownNow();
-
     int seq = threads.get(getLeaderThread()).getSeq();
     
     assertFalse("seq is -1 and we may have a zombie leader", seq == -1);