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 2014/01/19 22:20:59 UTC

svn commit: r1559587 - /lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java

Author: markrmiller
Date: Sun Jan 19 21:20:58 2014
New Revision: 1559587

URL: http://svn.apache.org/r1559587
Log:
SOLR-5577: Harden leaking Timer thread.

Modified:
    lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java?rev=1559587&r1=1559586&r2=1559587&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java Sun Jan 19 21:20:58 2014
@@ -87,6 +87,12 @@ public class ConnectionManager implement
         }
         
       }, (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();