Changeset 123b4ca

Timestamp:

Nov 9, 2015 5:48:19 PM (5 years ago)

Author:

zab2 <zab2@…>

Branches:

master

Children:

48f29402

Parents:

c944fcce

Message:

Fix locking on _nextExpire field

File:

• router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java (modified) (3 diffs)

router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java

@@ -259 +259 @@
     
     private class CleanupTask extends SimpleTimer2.TimedEvent {
+        /** LOCKING: _selectors */
         private long _nextExpire;
 
@@ -326 +327 @@
             if (log) {
                 int e = removing.size();
-                int r = _selectors.size();
+                int r;
+                synchronized(_selectors) {
+                    r = _selectors.size();
+                }
                 int a = _activeMessages.size();
                 if (r > 0 || e > 0 || a > 0)
                     _log.debug("Expired: " + e + " remaining: " + r + " active: " + a);
             }
-            synchronized(this) {
+            synchronized(_selectors) {
                 if (_nextExpire <= now)
                     _nextExpire = now + 10*1000;
@@ -338 +342 @@
         }
 
-        public synchronized void scheduleExpiration(MessageSelector sel) {
+        public void scheduleExpiration(MessageSelector sel) {
             long now = _context.clock().now();
-            if ( (_nextExpire <= now) || (sel.getExpiration() < _nextExpire) ) {
-                _nextExpire = sel.getExpiration();
-                reschedule(_nextExpire - now);
+            synchronized(_selectors) {
+                if ( (_nextExpire <= now) || (sel.getExpiration() < _nextExpire) ) {
+                    _nextExpire = sel.getExpiration();
+                    reschedule(_nextExpire - now);
+                }
             }
         }