[freenet-cvs] r20283 - branches/db4o/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-06-13 12:08:22 +0000 (Fri, 13 Jun 2008)
New Revision: 20283

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Only return a PersistentChosenRequest if it is actually persistent.

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-06-13 12:04:53 UTC (rev 20282)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-06-13 12:08:22 UTC (rev 20283)
@@ -188,9 +188,13 @@
                                key = null;
                        else
                                key = ((BaseSendableGet)req).getNodeKey(token, 
persistent() ? container : null);
-                       PersistentChosenRequest ret = new 
PersistentChosenRequest(this, req, token, key);
-                       if(req.persistent())
+                       ChosenRequest ret;
+                       if(req.persistent()) {
+                               ret = new PersistentChosenRequest(this, req, 
token, key);
                                container.set(ret);
+                       } else {
+                               ret = new ChosenRequest(req, token, key);
+                       }
                        if(key != null)
                                keysFetching.add(key);
                        return ret;