Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-02-09 19:45:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

SOLR-4509: Fix test failures with Java 9 module system by doing a correct cleanup

Browse Source
This commit is contained in:
Uwe Schindler 2016-04-02 20:13:43 +02:00
parent f8ea8b855e
commit d0156b1126
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java
View File

@ -91,12 +91,12 @@ public class TestCloudDeleteByQuery extends SolrCloudTestCase {
@AfterClass @AfterClass
private static void afterClass() throws Exception { private static void afterClass() throws Exception {
CLOUD_CLIENT.close(); CLOUD_CLIENT.close(); CLOUD_CLIENT = null;
S_ONE_LEADER_CLIENT.close(); S_ONE_LEADER_CLIENT.close(); S_ONE_LEADER_CLIENT = null;
S_TWO_LEADER_CLIENT.close(); S_TWO_LEADER_CLIENT.close(); S_TWO_LEADER_CLIENT = null;
S_ONE_NON_LEADER_CLIENT.close(); S_ONE_NON_LEADER_CLIENT.close(); S_ONE_NON_LEADER_CLIENT = null;
S_TWO_NON_LEADER_CLIENT.close(); S_TWO_NON_LEADER_CLIENT.close(); S_TWO_NON_LEADER_CLIENT = null;
NO_COLLECTION_CLIENT.close(); NO_COLLECTION_CLIENT.close(); NO_COLLECTION_CLIENT = null;
} }
@BeforeClass @BeforeClass

11
solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
View File

@ -206,11 +206,12 @@ public class TestTolerantUpdateProcessorCloud extends SolrCloudTestCase {
@AfterClass @AfterClass
public static void afterClass() throws IOException { public static void afterClass() throws IOException {
close(S_ONE_LEADER_CLIENT); close(S_ONE_LEADER_CLIENT); S_ONE_LEADER_CLIENT = null;
close(S_TWO_LEADER_CLIENT); close(S_TWO_LEADER_CLIENT); S_TWO_LEADER_CLIENT = null;
close(S_ONE_NON_LEADER_CLIENT); close(S_ONE_NON_LEADER_CLIENT); S_ONE_NON_LEADER_CLIENT = null;
close(S_TWO_NON_LEADER_CLIENT); close(S_TWO_NON_LEADER_CLIENT); S_TWO_NON_LEADER_CLIENT = null;
close(NO_COLLECTION_CLIENT); close(NO_COLLECTION_CLIENT); NO_COLLECTION_CLIENT = null;
close(CLOUD_CLIENT); CLOUD_CLIENT = null;
} }
private static void close(SolrClient client) throws IOException { private static void close(SolrClient client) throws IOException {

5
solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
View File

@ -138,6 +138,11 @@ public class TestTolerantUpdateProcessorRandomCloud extends SolrCloudTestCase {
client.close(); client.close();
} }
} }
NODE_CLIENTS = null;
if (CLOUD_CLIENT != null) {
CLOUD_CLIENT.close();
}
CLOUD_CLIENT = null;
} }
public void testRandomUpdates() throws Exception { public void testRandomUpdates() throws Exception {