Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-5577: Harden leaking Timer thread. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1561497 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2014-01-26 14:51:55 +00:00
parent 76c12eeb3d
commit cb8b1cd32b
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
View File

@ -72,8 +72,8 @@ public class ConnectionManager implements Watcher {
private synchronized void disconnected() {
cancelTimer();
if (!isClosed) {
disconnectedTimer = new Timer(true);
disconnectedTimer.schedule(new TimerTask() {
Timer newDcTimer = new Timer(true);
newDcTimer.schedule(new TimerTask() {
@Override
public void run() {
@ -84,7 +84,16 @@ public class ConnectionManager implements Watcher {
if (isClosed) {
// we might have closed after getting by isClosed
// and before starting the new timer
cancelTimer();
newDcTimer.cancel();
} else {
disconnectedTimer = newDcTimer;
if (isClosed) {
// now deal with we may have been closed after getting
// by isClosed but before setting disconnectedTimer -
// if close happens after isClosed check this time, it
// will handle stopping the timer
cancelTimer();
}
}
}
connected = false;
@ -196,7 +205,7 @@ public class ConnectionManager implements Watcher {
}
// we use a volatile rather than sync
// to avoid deadlock on shutdown
// to avoid possible deadlock on shutdown
public void close() {
this.isClosed = true;
this.likelyExpired = true;