Author: toad
Date: 2008-08-28 23:31:59 +0000 (Thu, 28 Aug 2008)
New Revision: 22209
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Fix NPEs
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-08-28 23:28:39 UTC (rev 22208)
+++
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-08-28 23:31:59 UTC (rev 22209)
@@ -468,8 +468,6 @@
altReq = (BaseSendableGet)
recent.remove(recent.size()-1);
}
}
- if(altReq != null)
- container.activate(altReq, 1);
if(altReq != null && (altReq.isCancelled(container) ||
altReq.isEmpty(container))) {
if(logMINOR)
Logger.minor(this, "Ignoring cancelled
recently succeeded item "+altReq);
@@ -480,10 +478,7 @@
// Use the recent one instead
if(logMINOR)
Logger.minor(this, "Recently succeeded
req "+altReq+" is better, using that, reregistering chosen "+req);
- if(req.persistent())
- innerRegister(req, random, container);
- else
- schedTransient.innerRegister(req,
random, container);
+ schedTransient.innerRegister(req, random, null);
req = altReq;
} else if(altReq != null) {
// Don't use the recent one
