mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-19 06:55:23 +02:00
Code Issues Wiki Activity

[282364] [dstore][multithread] timer-threads stay active after disconnect

Browse source
This commit is contained in:
David McKnight 2011-01-10 20:53:55 +00:00
parent ed172f6eb3
commit d19bcd042c
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java
View file

@ -90,7 +90,8 @@ public class XMLparser
private Throwable _panicException = null; private Throwable _panicException = null;
private boolean _isKeepAliveCompatible = false; private boolean _isKeepAliveCompatible = false;
private boolean _isKeepAliveEnabled = true; private boolean _isKeepAliveEnabled = false; // initial setting should be false so that keepalive doesn't start before getting preferences // let it get enabled after connect
private boolean _firstTime = true; private boolean _firstTime = true;
private KeepAliveRequestThread _kart = null; private KeepAliveRequestThread _kart = null;
@ -328,6 +329,7 @@ public class XMLparser
_initialKart = new KeepAliveRequestThread(KEEPALIVE_RESPONSE_TIMEOUT, socket); _initialKart = new KeepAliveRequestThread(KEEPALIVE_RESPONSE_TIMEOUT, socket);
_firstTime = false; _firstTime = false;
if (VERBOSE_KEEPALIVE) System.out.println("Starting initial KeepAlive thread."); //$NON-NLS-1$ if (VERBOSE_KEEPALIVE) System.out.println("Starting initial KeepAlive thread."); //$NON-NLS-1$
_dataStore.trace("Starting initial KeepAlive thread."); //$NON-NLS-1$
_initialKart.start(); _initialKart.start();
continue; continue;
} }
@ -346,16 +348,23 @@ public class XMLparser
{ {
_isKeepAliveCompatible = true; _isKeepAliveCompatible = true;
if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive compatible."); //$NON-NLS-1$ if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive compatible."); //$NON-NLS-1$
_dataStore.trace("KeepAlive compatible."); //$NON-NLS-1$
_initialKart = null; _initialKart = null;
} }
else else
{ {
_isKeepAliveCompatible = false; _isKeepAliveCompatible = false;
if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive incompatible."); //$NON-NLS-1$ if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive incompatible."); //$NON-NLS-1$
_dataStore.trace("KeepAlive incompatible."); //$NON-NLS-1$
_initialKart = null; _initialKart = null;
} }
} }
} }
else { // initial kart is null so we've already waited
if (!_isKeepAliveCompatible){
_isKeepAliveEnabled = false;
}
}
} }
int in = -1; int in = -1;
@ -389,7 +398,8 @@ public class XMLparser
{ {
if (_kart == null || !_kart.isAlive()){ if (_kart == null || !_kart.isAlive()){
_kart = new KeepAliveRequestThread(KEEPALIVE_RESPONSE_TIMEOUT, socket); _kart = new KeepAliveRequestThread(KEEPALIVE_RESPONSE_TIMEOUT, socket);
if (VERBOSE_KEEPALIVE) System.out.println("No activity on socket. KeepAlive thread started."); //$NON-NLS-1$ if (VERBOSE_KEEPALIVE) System.out.println("No activity on socket. KeepAlive thread started."); //$NON-NLS-1$
_dataStore.trace("No activity on socket. KeepAlive thread started."); //$NON-NLS-1$
_kart.start(); _kart.start();
continue; continue;
} }
@ -398,7 +408,14 @@ public class XMLparser
} }
else // no keepalive else // no keepalive
{ {
in = reader.read(); try {
in = reader.read();
}
catch (InterruptedIOException e){
_dataStore.trace("read timeout - continuing"); //$NON-NLS-1$
// no keepalive, so just try reading again
continue;
}
} }
if (in == -1) if (in == -1)
@ -730,12 +747,14 @@ public class XMLparser
else if (_isKeepAlive) else if (_isKeepAlive)
{ {
if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive request received, sending confirmation."); //$NON-NLS-1$ if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive request received, sending confirmation."); //$NON-NLS-1$
_dataStore.trace("KeepAlive request received, sending confirmation."); //$NON-NLS-1$
result.getDataStore().sendKeepAliveConfirmation(); result.getDataStore().sendKeepAliveConfirmation();
_isKeepAlive = false; _isKeepAlive = false;
} }
else if (_isKeepAliveConfirm ) else if (_isKeepAliveConfirm )
{ {
if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive confirmation received."); //$NON-NLS-1$ if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive confirmation received."); //$NON-NLS-1$
_dataStore.trace("KeepAlive confirmation received."); //$NON-NLS-1$
if (_initialKart != null) _initialKart.interrupt(); if (_initialKart != null) _initialKart.interrupt();
_isKeepAliveConfirm = false; _isKeepAliveConfirm = false;
} }
@ -1118,9 +1137,11 @@ public class XMLparser
catch (InterruptedException e) catch (InterruptedException e)
{ {
if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive thread interrupted."); //$NON-NLS-1$ if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive thread interrupted."); //$NON-NLS-1$
_dataStore.trace("KeepAlive thread interrupted."); //$NON-NLS-1$
return; return;
} }
if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive thread failed to be interrupted."); //$NON-NLS-1$ if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive thread failed to be interrupted."); //$NON-NLS-1$
_dataStore.trace("KeepAlive thread failed to be interrupted."); //$NON-NLS-1$
_failed = true; _failed = true;
} }