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/02 20:14:00 UTC
lucene-solr:master: SOLR-4509: Fix test failures with Java 9 module
system by doing a correct cleanup
Repository: lucene-solr
Updated Branches:
refs/heads/master f8ea8b855 -> d0156b112
SOLR-4509: Fix test failures with Java 9 module system by doing a correct cleanup
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d0156b11
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d0156b11
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d0156b11
Branch: refs/heads/master
Commit: d0156b1126f094e4e469172d55842ed77cb82943
Parents: f8ea8b8
Author: Uwe Schindler <us...@apache.org>
Authored: Sat Apr 2 20:13:43 2016 +0200
Committer: Uwe Schindler <us...@apache.org>
Committed: Sat Apr 2 20:13:43 2016 +0200
----------------------------------------------------------------------
.../org/apache/solr/cloud/TestCloudDeleteByQuery.java | 12 ++++++------
.../solr/cloud/TestTolerantUpdateProcessorCloud.java | 11 ++++++-----
.../cloud/TestTolerantUpdateProcessorRandomCloud.java | 5 +++++
3 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d0156b11/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java
index 26db949..9ded40c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java
@@ -91,12 +91,12 @@ public class TestCloudDeleteByQuery extends SolrCloudTestCase {
@AfterClass
private static void afterClass() throws Exception {
- CLOUD_CLIENT.close();
- S_ONE_LEADER_CLIENT.close();
- S_TWO_LEADER_CLIENT.close();
- S_ONE_NON_LEADER_CLIENT.close();
- S_TWO_NON_LEADER_CLIENT.close();
- NO_COLLECTION_CLIENT.close();
+ CLOUD_CLIENT.close(); CLOUD_CLIENT = null;
+ S_ONE_LEADER_CLIENT.close(); S_ONE_LEADER_CLIENT = null;
+ S_TWO_LEADER_CLIENT.close(); S_TWO_LEADER_CLIENT = null;
+ S_ONE_NON_LEADER_CLIENT.close(); S_ONE_NON_LEADER_CLIENT = null;
+ S_TWO_NON_LEADER_CLIENT.close(); S_TWO_NON_LEADER_CLIENT = null;
+ NO_COLLECTION_CLIENT.close(); NO_COLLECTION_CLIENT = null;
}
@BeforeClass
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d0156b11/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
index 929d736..6c81673 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
@@ -206,11 +206,12 @@ public class TestTolerantUpdateProcessorCloud extends SolrCloudTestCase {
@AfterClass
public static void afterClass() throws IOException {
- close(S_ONE_LEADER_CLIENT);
- close(S_TWO_LEADER_CLIENT);
- close(S_ONE_NON_LEADER_CLIENT);
- close(S_TWO_NON_LEADER_CLIENT);
- close(NO_COLLECTION_CLIENT);
+ close(S_ONE_LEADER_CLIENT); S_ONE_LEADER_CLIENT = null;
+ close(S_TWO_LEADER_CLIENT); S_TWO_LEADER_CLIENT = null;
+ close(S_ONE_NON_LEADER_CLIENT); S_ONE_NON_LEADER_CLIENT = null;
+ close(S_TWO_NON_LEADER_CLIENT); S_TWO_NON_LEADER_CLIENT = null;
+ close(NO_COLLECTION_CLIENT); NO_COLLECTION_CLIENT = null;
+ close(CLOUD_CLIENT); CLOUD_CLIENT = null;
}
private static void close(SolrClient client) throws IOException {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d0156b11/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
index a722ad2..3a9680e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
@@ -138,6 +138,11 @@ public class TestTolerantUpdateProcessorRandomCloud extends SolrCloudTestCase {
client.close();
}
}
+ NODE_CLIENTS = null;
+ if (CLOUD_CLIENT != null) {
+ CLOUD_CLIENT.close();
+ }
+ CLOUD_CLIENT = null;
}
public void testRandomUpdates() throws Exception {