[freenet-cvs] r21333 - branches/db4o/freenet/src/freenet/node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2008-07-23 12:36:30 +0000 (Wed, 23 Jul 2008)
New Revision: 21333

Modified:
   branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java
Log:
Activate/deactivate requests.
Activate global client - we shouldn't need to, add a comment

Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java   2008-07-23 
12:34:37 UTC (rev 21332)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java   2008-07-23 
12:36:30 UTC (rev 21333)
@@ -573,6 +573,8 @@
        public ClientRequest[] getGlobalRequests(ObjectContainer container) {
                Vector v = new Vector();
                globalRebootClient.addPersistentRequests(v, false, null);
+               // FIXME remove this???? I think we avoid deactivating the 
global client now...?
+               container.activate(globalForeverClient, 1);
                globalForeverClient.addPersistentRequests(v, false, container);
                return (ClientRequest[]) v.toArray(new ClientRequest[v.size()]);
        }
@@ -723,8 +725,10 @@
                                        boolean success = false;
                                        try {
                                                ClientRequest req = 
globalForeverClient.getRequest(identifier, container);
+                                               container.activate(req, 1);
                                                if(req != null)
                                                        
req.modifyRequest(newToken, newPriority, FCPServer.this, container);
+                                               container.deactivate(req, 1);
                                        } finally {
                                                synchronized(ow) {
                                                        ow.success = success;
@@ -955,6 +959,7 @@
                                                        ow.notifyAll();
                                                }
                                        }
+                                       container.deactivate(req, 1);
                                }

                        }, NativeThread.HIGH_PRIORITY, false);
@@ -1044,9 +1049,11 @@
                                FetchResult result = null;
                                try {
                                        ClientGet get = 
globalForeverClient.getCompletedRequest(key, container);
+                                       container.activate(get, 1);
                                        if(get != null) {
                                                result = new FetchResult(new 
ClientMetadata(get.getMIMEType(container)), get.getBucket());
                                        }
+                                       container.deactivate(get, 1);
                                } finally {
                                        synchronized(ow) {
                                                ow.result = result;