| commit | c96b6a03c4569734be2e9ad30c622c2ba2d9a978 | [log] [tgz] |
|---|---|---|
| author | Mark Robert Miller <markrmiller@apache.org> | Sun Jan 19 21:23:04 2014 +0000 |
| committer | Mark Robert Miller <markrmiller@apache.org> | Sun Jan 19 21:23:04 2014 +0000 |
| tree | 06ad98e4b1bd1a3cba7dc482f27dc3a04cae3402 | |
| parent | 9ba4f494f853251bf218012e8a4326a01f57b6d4 [diff] |
SOLR-5577: Harden leaking Timer thread. git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1559589 13f79535-47bb-0310-9956-ffa450edef68
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 04113d0..d001d5f 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
@@ -84,6 +84,12 @@ } }, (long) (client.getZkClientTimeout() * 0.90)); + if (isClosed) { + // we might have closed after getting by isClosed + // and before starting the new timer + disconnectedTimer.cancel(); + disconnectedTimer = null; + } } connected = false; notifyAll();