[lucene-solr] branch reference_impl updated: @218 - Fix this close.

[ma...@apache.org]

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 1451082  @218 - Fix this close.
1451082 is described below

commit 1451082a24e6bc008c4bc6d1e97e23c438a1ce22
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Jul 16 12:23:57 2020 -0500

    @218 - Fix this close.
---
 .../java/org/apache/solr/client/solrj/impl/CloudSolrClient.java    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
index e62feac..b1c0644 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
@@ -168,15 +168,12 @@ public class CloudSolrClient extends BaseCloudSolrClient {
 
   @Override
   public void close() throws IOException {
-    try (ParWork closer = new ParWork(this)) {
+    try (ParWork closer = new ParWork(this, true)) {
       closer.collect(stateProvider);
-
-
       if (shutdownLBHttpSolrServer) {
         closer.collect(lbClient);
       }
-
-      if (clientIsInternal && myClient != null) {
+      if (clientIsInternal) {
         closer.collect(myClient);
       }
       closer.addCollect("cloudclient");