Author: toad
Date: 2008-01-25 17:17:47 +0000 (Fri, 25 Jan 2008)
New Revision: 17282
Modified:
trunk/freenet/src/freenet/io/comm/MessageCore.java
Log:
Log an error as well as clearing.
Modified: trunk/freenet/src/freenet/io/comm/MessageCore.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/MessageCore.java 2008-01-25 17:16:41 UTC
(rev 17281)
+++ trunk/freenet/src/freenet/io/comm/MessageCore.java 2008-01-25 17:17:47 UTC
(rev 17282)
@@ -288,7 +288,10 @@
public void addAsyncFilter(MessageFilter filter,
AsyncMessageFilterCallback callback) throws DisconnectedException {
filter.setAsyncCallback(callback);
- filter.clearMatched();
+ if(filter.matched()) {
+ Logger.error(this, "addAsyncFilter() on a filter which
is already matched: "+filter, new Exception("error"));
+ filter.clearMatched();
+ }
filter.onStartWaiting();
if(logMINOR) Logger.minor(this, "Adding async filter "+filter+"
for "+callback);
Message ret = null;
@@ -365,7 +368,10 @@
boolean logDEBUG = Logger.shouldLog(Logger.DEBUG, this);
if(logDEBUG) Logger.debug(this, "Waiting for "+filter);
long startTime = System.currentTimeMillis();
- filter.clearMatched();
+ if(filter.matched()) {
+ Logger.error(this, "waitFor() on a filter which is
already matched: "+filter, new Exception("error"));
+ filter.clearMatched();
+ }
filter.onStartWaiting();
Message ret = null;
if(filter.anyConnectionsDropped())
