Author: robert
Date: 2008-01-29 16:36:59 +0000 (Tue, 29 Jan 2008)
New Revision: 17391
Modified:
trunk/freenet/src/freenet/io/comm/MessageCore.java
Log:
use droppedConnection() for drops, not getSource()
Modified: trunk/freenet/src/freenet/io/comm/MessageCore.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/MessageCore.java 2008-01-29 16:25:59 UTC
(rev 17390)
+++ trunk/freenet/src/freenet/io/comm/MessageCore.java 2008-01-29 16:36:59 UTC
(rev 17391)
@@ -300,7 +300,7 @@
Message ret = null;
if(filter.anyConnectionsDropped()) {
throw new DisconnectedException();
- //or... filter.onDroppedConnection(filter.getSource());
+ //or...
filter.onDroppedConnection(filter.droppedConnection());
}
// Check to see whether the filter matches any of the recently
_unclaimed messages
// Drop any _unclaimed messages that the filter doesn't match
that are also older than MAX_UNCLAIMED_FIFO_ITEM_LIFETIME
@@ -312,7 +312,7 @@
//have disconnected between check above and locking, so
we *must* check again.
if(filter.anyConnectionsDropped()) {
throw new DisconnectedException();
- //or...
filter.onDroppedConnection(filter.getSource());
+ //or...
filter.onDroppedConnection(filter.droppedConnection());
//but we are holding the _filters lock!
}
if(logMINOR) Logger.minor(this, "Checking _unclaimed");
@@ -379,7 +379,7 @@
filter.onStartWaiting();
Message ret = null;
if(filter.anyConnectionsDropped()) {
- filter.onDroppedConnection(filter.getSource());
+ filter.onDroppedConnection(filter.droppedConnection());
throw new DisconnectedException();
}
// Check to see whether the filter matches any of the recently
_unclaimed messages
