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/03 20:14:58 UTC
svn commit: r1555207 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/solrj/
solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
Author: markrmiller
Date: Fri Jan 3 19:14:57 2014
New Revision: 1555207
URL: http://svn.apache.org/r1555207
Log:
SOLR-5577: fix possible race on canceling timer on close
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java?rev=1555207&r1=1555206&r2=1555207&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java Fri Jan 3 19:14:57 2014
@@ -177,8 +177,11 @@ public class ConnectionManager implement
public void close() {
this.isClosed = true;
this.likelyExpired = true;
- if (this.disconnectedTimer != null) {
+ try {
this.disconnectedTimer.cancel();
+ } catch (NullPointerException e) {
+ // fine
+ } finally {
this.disconnectedTimer = null;
}
}