You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2015/09/13 23:34:32 UTC

svn commit: r1702833 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/test-framework/ solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java

Author: uschindler
Date: Sun Sep 13 21:34:30 2015
New Revision: 1702833

URL: http://svn.apache.org/r1702833
Log:
Merged revision(s) 1702831 from lucene/dev/trunk:
Revert the AbstractZkTestCase changes for now
was: LUCENE-6795: Fix Solr tests that break RamUsageTester on Java 9 Jigsaw

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/test-framework/   (props changed)
    lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java

Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java?rev=1702833&r1=1702832&r2=1702833&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java Sun Sep 13 21:34:30 2015
@@ -46,14 +46,7 @@ public abstract class AbstractZkTestCase
 
   
   public static File SOLRHOME;
-
-  protected static ZkTestServer zkServer;
-
-  protected static String zkDir;
-
-
-  @BeforeClass
-  public static void azt_beforeClass() throws Exception {
+  static {
     try {
       SOLRHOME = new File(TEST_HOME());
     } catch (RuntimeException e) {
@@ -61,7 +54,15 @@ public abstract class AbstractZkTestCase
       // solrj tests not working with TEST_HOME()
       // must override getSolrHome
     }
+  }
+  
+  protected static ZkTestServer zkServer;
+
+  protected static String zkDir;
+
 
+  @BeforeClass
+  public static void azt_beforeClass() throws Exception {
     zkDir = createTempDir("zkData").toFile().getAbsolutePath();
     zkServer = new ZkTestServer(zkDir);
     zkServer.run();
@@ -160,7 +161,6 @@ public abstract class AbstractZkTestCase
       zkServer = null;
     }
     zkDir = null;
-    SOLRHOME = null;
   }
 
   protected void printLayout(String zkHost) throws Exception {