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 2013/12/29 01:14:01 UTC
svn commit: r1553981 -
/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
Author: markrmiller
Date: Sun Dec 29 00:14:01 2013
New Revision: 1553981
URL: http://svn.apache.org/r1553981
Log:
SOLR-5577: Don't start a timer on disconnect if we are already closed
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=1553981&r1=1553980&r2=1553981&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 Dec 29 00:14:01 2013
@@ -82,18 +82,19 @@ public class ConnectionManager implement
disconnectedTimer.cancel();
disconnectedTimer = null;
}
-
- disconnectedTimer = new Timer();
- disconnectedTimer.schedule(new TimerTask() {
-
- @Override
- public void run() {
- synchronized (ConnectionManager.this) {
- likelyExpired = true;
+ if (!isClosed) {
+ disconnectedTimer = new Timer();
+ disconnectedTimer.schedule(new TimerTask() {
+
+ @Override
+ public void run() {
+ synchronized (ConnectionManager.this) {
+ likelyExpired = true;
+ }
}
- }
-
- }, (long) (client.getZkClientTimeout() * 0.90));
+
+ }, (long) (client.getZkClientTimeout() * 0.90));
+ }
connected = false;
}