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

Timers: Improve OutboundMessageRegistry locking

Browse Source 
SimpleTimer2 cleanups
possible fix for ticket #1694
This commit is contained in:
zzz
2015-11-04 14:57:07 +00:00
parent ef428d559e
commit b15ea8ba2f
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
View File

@ -330,12 +330,14 @@ public class OutboundMessageRegistry {
if (r > 0 || e > 0 || a > 0)
_log.debug("Expired: " + e + " remaining: " + r + " active: " + a);
}
if (_nextExpire <= now)
_nextExpire = now + 10*1000;
schedule(_nextExpire - now);
synchronized(this) {
if (_nextExpire <= now)
_nextExpire = now + 10*1000;
schedule(_nextExpire - now);
}
}
public void scheduleExpiration(MessageSelector sel) {
public synchronized void scheduleExpiration(MessageSelector sel) {
long now = _context.clock().now();
if ( (_nextExpire <= now) || (sel.getExpiration() < _nextExpire) ) {
_nextExpire = sel.getExpiration();