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/10 16:40:04 UTC
svn commit: r1557157 - in /lucene/dev/branches/lucene_solr_4_6: ./ solr/
solr/solrj/
solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
Author: markrmiller
Date: Fri Jan 10 15:40:03 2014
New Revision: 1557157
URL: http://svn.apache.org/r1557157
Log:
SOLR-5577: don't start timer thread in constructor
Modified:
lucene/dev/branches/lucene_solr_4_6/ (props changed)
lucene/dev/branches/lucene_solr_4_6/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_6/solr/solrj/ (props changed)
lucene/dev/branches/lucene_solr_4_6/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
Modified: lucene/dev/branches/lucene_solr_4_6/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_6/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java?rev=1557157&r1=1557156&r2=1557157&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_6/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java (original)
+++ lucene/dev/branches/lucene_solr_4_6/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java Fri Jan 10 15:40:03 2014
@@ -35,8 +35,8 @@ public class ConnectionManager implement
private final String name;
private CountDownLatch clientConnected;
- private KeeperState state;
- private boolean connected;
+ private KeeperState state = KeeperState.Disconnected;
+ private boolean connected = false;
private boolean likelyExpired = true;
private final ZkClientConnectionStrategy connectionStrategy;
@@ -57,13 +57,7 @@ public class ConnectionManager implement
this.connectionStrategy = strat;
this.zkServerAddress = zkServerAddress;
this.onReconnect = onConnect;
- reset();
- }
-
- private synchronized void reset() {
clientConnected = new CountDownLatch(1);
- state = KeeperState.Disconnected;
- disconnected();
}
private synchronized void connected() {