svn commit: r1023645 - /lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/AbstractZkTestCase.java

[yo...@apache.org]

Author: yonik
Date: Mon Oct 18 03:47:06 2010
New Revision: 1023645

URL: http://svn.apache.org/viewvc?rev=1023645&view=rev
Log:
tests: temp hack to close unused core container

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

Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/AbstractZkTestCase.java?rev=1023645&r1=1023644&r2=1023645&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/AbstractZkTestCase.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/AbstractZkTestCase.java Mon Oct 18 03:47:06 2010
@@ -42,23 +42,28 @@ public abstract class AbstractZkTestCase
   protected static Logger log = LoggerFactory
       .getLogger(AbstractZkTestCase.class);
 
-  protected ZkTestServer zkServer;
+  protected static ZkTestServer zkServer;
 
-  protected String zkDir;
+  protected static String zkDir;
 
   public AbstractZkTestCase() {
 
   }
 
   @BeforeClass
-  public static void beforeClass() throws Exception {
+  public static void azt_beforeClass() throws Exception {
   }
   
   @Override
   public void setUp() throws Exception {
-
     super.setUp();
-    
+
+    if (h != null) {
+      log.warn("HACK: closing previous test harness");     
+      h.close();
+      h=null;
+    }
+
     zkDir = dataDir.getAbsolutePath() + File.separator
         + "zookeeper/server1/data";
     zkServer = new ZkTestServer(zkDir);
@@ -80,7 +85,7 @@ public abstract class AbstractZkTestCase
         this.dataDir = AbstractZkTestCase.dataDir.getAbsolutePath();
       }
     };
-    
+
     h = new TestHarness("", init);
     lrf = h.getRequestFactory("standard", 0, 20, "version", "2.2");