[freenet-cvs] r17268 - trunk/freenet/src/freenet/io/comm

[t...@freenetproject.org]

Author: toad
Date: 2008-01-25 14:08:07 +0000 (Fri, 25 Jan 2008)
New Revision: 17268

Modified:
   trunk/freenet/src/freenet/io/comm/MessageCore.java
Log:
Throw if necessary here. anyConnectionsDropped() was meaningless.

Modified: trunk/freenet/src/freenet/io/comm/MessageCore.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/MessageCore.java  2008-01-25 13:54:48 UTC 
(rev 17267)
+++ trunk/freenet/src/freenet/io/comm/MessageCore.java  2008-01-25 14:08:07 UTC 
(rev 17268)
@@ -343,7 +343,12 @@
                        filter.clearMatched();
                } else {
                        // Might have disconnected between check above and 
locking _filters.
-                       filter.anyConnectionsDropped();
+                       if(filter.anyConnectionsDropped()) {
+                               synchronized(_filters) {
+                                       _filters.remove(filter);
+                               }
+                               throw new DisconnectedException();
+                       }
                }
        }