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/08/29 12:12:15 UTC

[lucene-solr] 20/22: @620 Remove this semi hack, may have helped something at some point, but should not need it and may be causing a rare thread leak now.

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

commit 470593dbd5a6c0f7f9816d291eff619316b1ad68
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Aug 28 17:51:45 2020 -0500

    @620 Remove this semi hack, may have helped something at some point, but should not need it and may be causing a rare thread leak now.
---
 .../solr/client/solrj/impl/Http2SolrClient.java      | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index e1acaa4..89002f9 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -252,25 +252,7 @@ public class Http2SolrClient extends SolrClient {
     asyncTracker.waitForComplete();
     if (closeClient) {
       try {
-        try (ParWork closer = new ParWork(this, false, true)) {
-          closer.collect("httpClient", () -> {
-                try {
-                  httpClient.stop();
-                } catch (InterruptedException e) {
-                  ParWork.propegateInterrupt(e);
-                } catch (Exception e) {
-                  log.error("Exception closing httpClient", e);
-                }
-              });
-
-          closer.collect("httpClientScheduler", () -> {
-            try {
-              httpClient.getScheduler().stop();
-            } catch (Exception e) {
-              ParWork.propegateInterrupt(e);
-            }
-          });
-        }
+        httpClient.stop();
       } catch (Exception e) {
         log.error("Exception closing httpClient", e);
       }