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

Interrupt when cancelling events

Browse Source
This commit is contained in:
zab2
2015-11-13 23:28:02 +00:00
parent 8a1f02aa89
commit e6644236ed
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,7 +396,7 @@ public class SimpleTimer2 {
// There's probably a race here, where it's cancelled after it's running
// The result (if rescheduled) is a dup on the queue, see tickets 1694, 1705
// Mitigated by close-to-execution check in reschedule()
boolean cancelled = _future.cancel(false);
boolean cancelled = _future.cancel(true);
if (cancelled)
_state = TimedEventState.CANCELLED;
else
@@ -422,6 +422,10 @@ public class SimpleTimer2 {
long before = System.currentTimeMillis();
long delay = 0;
synchronized(this) {
if (Thread.currentThread().isInterrupted()) {
_log.warn("I was interrupted in run, state "+_state+" event "+this);
return;
}
if (_rescheduleAfterRun)
throw new IllegalStateException(this + " rescheduleAfterRun cannot be true here");