You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/07/27 13:39:39 UTC
[lucene-solr] branch reference_impl updated: @375 Tweak, tweak.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl by this push:
new 4949c24 @375 Tweak, tweak.
4949c24 is described below
commit 4949c246cadf6725a4e6a1ea6c6316fdb8300ed6
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Jul 27 08:37:24 2020 -0500
@375 Tweak, tweak.
---
solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java | 1 +
.../solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java | 2 +-
solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
index 334f7a2..7f9cd7a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
@@ -160,6 +160,7 @@ public class TestRandomFlRTGCloud extends SolrCloudTestCase {
}
CLIENTS.clear();
CLOUD_CLIENT = null;
+ shutdownCluster();
}
/**
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java
index bfdf31d..74c5e4f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java
@@ -77,7 +77,7 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
@After
public void tearDownCluster() throws Exception {
- cluster.shutdown();
+ if (cluster != null) cluster.shutdown();
cluster = null;
}
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
index d458e57..fb5905d 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
@@ -233,6 +233,7 @@ public class ConnectionManager implements Watcher, Closeable {
// our retry loop will try to create one again
try {
keeper. close();
+ keeper = null;
} catch (Exception e) {
ParWork.propegateInterrupt("Exception closing keeper after hitting exception", e);
if (e instanceof InterruptedException || e instanceof AlreadyClosedException) {