echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SimpleTimer2: Additional fix for uncaught IllegalStateException

Browse Source 
affecting streaming timers (ticket #1672)
Minor streaming cleanup
This commit is contained in:
zzz
2015-10-08 13:42:31 +00:00
parent 03f9df4ff0
commit 419d6a8e18
4 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/src/net/i2p/util/SimpleTimer2.java
View File

@ -257,6 +257,8 @@ public class SimpleTimer2 {
private long _nextRun;
/** whether this was scheduled during RUNNING state. LOCKING: this */
private boolean _rescheduleAfterRun;
/** whether this was cancelled during RUNNING state. LOCKING: this */
private boolean _cancelAfterRun;
/** must call schedule() later */
public TimedEvent(SimpleTimer2 pool) {
@ -290,7 +292,8 @@ public class SimpleTimer2 {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Scheduling: " + this + " timeout = " + timeoutMs + " state: " + _state);
if (timeoutMs <= 0) {
if (_log.shouldLog(Log.WARN))
// streaming timers do call with timeoutMs == 0
if (timeoutMs < 0 && _log.shouldLog(Log.WARN))
_log.warn("Timeout <= 0: " + this + " timeout = " + timeoutMs + " state: " + _state);
timeoutMs = 1; // otherwise we may execute before _future is updated, which is fine
// except it triggers 'early execution' warning logging
@ -298,6 +301,7 @@ public class SimpleTimer2 {
// always set absolute time of execution
_nextRun = timeoutMs + System.currentTimeMillis();
_cancelAfterRun = false;
switch(_state) {
case RUNNING:
@ -373,7 +377,9 @@ public class SimpleTimer2 {
case CANCELLED: // fall through
case IDLE:
break; // my preference is to throw IllegalState here, but let it be.
case RUNNING: // fall through
case RUNNING:
_cancelAfterRun = true;
return true;
case SCHEDULED:
boolean cancelled = _future.cancel(false);
if (cancelled)
@ -447,11 +453,16 @@ public class SimpleTimer2 {
case CANCELLED:
break; // nothing
case RUNNING:
_state = TimedEventState.IDLE;
// do we need to reschedule?
if (_rescheduleAfterRun) {
_rescheduleAfterRun = false;
schedule(_nextRun - System.currentTimeMillis());
if (_cancelAfterRun) {
_cancelAfterRun = false;
_state = TimedEventState.CANCELLED;
} else {
_state = TimedEventState.IDLE;
// do we need to reschedule?
if (_rescheduleAfterRun) {
_rescheduleAfterRun = false;
schedule(_nextRun - System.currentTimeMillis());
}
}
}
}