[lucene-solr] branch reference_impl updated: @235 - Prevent thread leak.

[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 8782f69  @235 - Prevent thread leak.
8782f69 is described below

commit 8782f698adf3715af3c6bf7313b0e3907bfcaa6c
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Jul 18 17:02:09 2020 -0500

    @235 - Prevent thread leak.
---
 solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
index 003deb2..06f7dc3 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
@@ -650,10 +650,13 @@ public class ZkTestServer implements Closeable {
       });
     }
 
+
+    startupWait = new CountDownLatch(1);
     if (zooThread != null) {
       ObjectReleaseTracker.release(zooThread);
     }
-    startupWait = new CountDownLatch(1);
+    zooThread.interrupt();
+    zooThread.join(10000);
     zooThread = null;
     ObjectReleaseTracker.release(this);