[lucene-solr] branch reference_impl_dev updated: @871 Avoid exceptional NPE.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/reference_impl_dev by this push:
     new 981803b  @871 Avoid exceptional NPE.
981803b is described below

commit 981803b813c60e90813a7400d573cd1253f025a1
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Sep 28 18:21:43 2020 -0500

    @871 Avoid exceptional NPE.
---
 .../src/java/org/apache/solr/common/cloud/ConnectionManager.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 6ff483d..63f3ee3 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
@@ -342,8 +342,9 @@ public class ConnectionManager implements Watcher, Closeable {
 
 
     client.zkConnManagerCallbackExecutor.shutdown();
-
-    keeper.close();
+    if (keeper != null) {
+      keeper.close();
+    }
     keeper = null;
     client.zkCallbackExecutor.shutdown();
     ExecutorUtil.awaitTermination(client.zkCallbackExecutor);