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 2016/04/19 10:16:27 UTC
lucene-solr:branch_6x: Fix Java 9 problem with static field leakage
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 3eb1ce6cf -> b95bbb809
Fix Java 9 problem with static field leakage
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b95bbb80
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b95bbb80
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b95bbb80
Branch: refs/heads/branch_6x
Commit: b95bbb809271e846e024626760363c29de7166f6
Parents: 3eb1ce6
Author: Uwe Schindler <us...@apache.org>
Authored: Tue Apr 19 10:15:03 2016 +0200
Committer: Uwe Schindler <us...@apache.org>
Committed: Tue Apr 19 10:16:12 2016 +0200
----------------------------------------------------------------------
.../test/org/apache/solr/cloud/TestStressLiveNodes.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b95bbb80/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java b/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java
index 28dcc82..3bf6b70 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java
@@ -20,7 +20,6 @@ import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Random;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
@@ -28,17 +27,15 @@ import java.util.concurrent.TimeUnit;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.cloud.SolrCloudTestCase;
-import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.util.ExecutorUtil;
-import org.apache.solr.core.CloudConfig.CloudConfigBuilder;
import org.apache.solr.util.DefaultSolrThreadFactory;
import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.slf4j.Logger;
@@ -80,6 +77,12 @@ public class TestStressLiveNodes extends SolrCloudTestCase {
ZK_SERVER_ADDR = cluster.getZkServer().getZkAddress();
}
+
+ @AfterClass
+ private static void afterClass() throws Exception {
+ CLOUD_CLIENT.close();
+ CLOUD_CLIENT = null;
+ }
private static SolrZkClient newSolrZkClient() {
assertNotNull(ZK_SERVER_ADDR);