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

[t...@freenetproject.org]

Author: toad
Date: 2008-08-28 23:28:39 +0000 (Thu, 28 Aug 2008)
New Revision: 22208

Modified:
   branches/db4o/freenet/src/freenet/client/async/ClientRequester.java
Log:
Fix NPEs


Modified: branches/db4o/freenet/src/freenet/client/async/ClientRequester.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequester.java 
2008-08-28 23:26:20 UTC (rev 22207)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequester.java 
2008-08-28 23:28:39 UTC (rev 22208)
@@ -172,24 +172,30 @@
        }

        public void addToRequests(SendableRequest req, ObjectContainer 
container) {
-               container.activate(requests, 1);
+               if(persistent())
+                       container.activate(requests, 1);
                requests.addRequest(req, container);
-               container.deactivate(requests, 1);
+               if(persistent())
+                       container.deactivate(requests, 1);
        }

        public SendableRequest[] getSendableRequests(ObjectContainer container) 
{
-               container.activate(requests, 1);
+               if(persistent())
+                       container.activate(requests, 1);
                SendableRequest[] reqs = requests.listRequests(container);
-               container.deactivate(requests, 1);
+               if(persistent())
+                       container.deactivate(requests, 1);
                return reqs;
        }

        public void removeFromRequests(SendableRequest req, ObjectContainer 
container, boolean dontComplain) {
-               container.activate(requests, 1);
+               if(persistent())
+                       container.activate(requests, 1);
                if(!requests.removeRequest(req, container) && !dontComplain) {
                        Logger.error(this, "Not in request list for "+this+": 
"+req);
                }
-               container.deactivate(requests, 1);
+               if(persistent())
+                       container.deactivate(requests, 1);
        }

 }