Author: toad
Date: 2008-07-29 00:41:47 +0000 (Tue, 29 Jul 2008)
New Revision: 21465
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
branches/db4o/freenet/src/freenet/node/SendableRequest.java
Log:
Logging
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-07-29 00:38:48 UTC (rev 21464)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-07-29 00:41:47 UTC (rev 21465)
@@ -1193,11 +1193,11 @@
return isInsertScheduler;
}
- public void removeFromAllRequestsByClientRequest(ClientRequester
clientRequest, SendableRequest get) {
+ public void removeFromAllRequestsByClientRequest(ClientRequester
clientRequest, SendableRequest get, boolean dontComplain) {
if(get.persistent())
- schedCore.removeFromAllRequestsByClientRequest(get,
clientRequest);
+ schedCore.removeFromAllRequestsByClientRequest(get,
clientRequest, dontComplain);
else
-
schedTransient.removeFromAllRequestsByClientRequest(get, clientRequest);
+
schedTransient.removeFromAllRequestsByClientRequest(get, clientRequest,
dontComplain);
}
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
2008-07-29 00:38:48 UTC (rev 21464)
+++
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
2008-07-29 00:41:47 UTC (rev 21465)
@@ -164,12 +164,13 @@
recentSuccesses.remove(0);
}
- protected void removeFromAllRequestsByClientRequest(SendableRequest
req, ClientRequester cr) {
+ protected void removeFromAllRequestsByClientRequest(SendableRequest
req, ClientRequester cr, boolean dontComplain) {
if(logMINOR)
Logger.minor(this, "Removing from
allRequestsByClientRequest: "+req+ " for "+cr);
Set v = (Set) allRequestsByClientRequest.get(cr);
if(v == null) {
- Logger.error(this, "No HashSet registered for
"+cr+" for "+req);
+ if(!dontComplain)
+ Logger.error(this, "No HashSet
registered for "+cr+" for "+req);
} else {
boolean removed = v.remove(req);
if(v.isEmpty())
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-07-29 00:38:48 UTC (rev 21464)
+++
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-07-29 00:41:47 UTC (rev 21465)
@@ -503,9 +503,9 @@
ClientRequester cr = req.getClientRequest();
if(req.canRemove(container)) {
if(req.persistent())
-
removeFromAllRequestsByClientRequest(req, cr);
+
removeFromAllRequestsByClientRequest(req, cr, false);
else
-
schedTransient.removeFromAllRequestsByClientRequest(req, cr);
+
schedTransient.removeFromAllRequestsByClientRequest(req, cr, false);
// Do not remove from the pendingKeys list.
// Whether it is running a request, waiting to
execute, or waiting on the
// cooldown queue, ULPRs and backdoor
coalescing should still be active.
Modified: branches/db4o/freenet/src/freenet/node/SendableRequest.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/SendableRequest.java 2008-07-29
00:38:48 UTC (rev 21464)
+++ branches/db4o/freenet/src/freenet/node/SendableRequest.java 2008-07-29
00:41:47 UTC (rev 21465)
@@ -111,7 +111,7 @@
ClientRequester cr = getClientRequest();
if(persistent)
container.activate(cr, 1);
- getScheduler(context).removeFromAllRequestsByClientRequest(cr,
this);
+ getScheduler(context).removeFromAllRequestsByClientRequest(cr,
this, true);
// FIXME should we deactivate??
//if(persistent) container.deactivate(cr, 1);
}
