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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-23 12:34:37 +0000 (Wed, 23 Jul 2008)
New Revision: 21332

Modified:
   branches/db4o/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java
   branches/db4o/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
Log:
Activate/deactivate requests in jobs

Modified: 
branches/db4o/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java   
    2008-07-23 12:33:52 UTC (rev 21331)
+++ 
branches/db4o/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java   
    2008-07-23 12:34:37 UTC (rev 21332)
@@ -44,6 +44,7 @@

                        public void run(ObjectContainer container, 
ClientContext context) {
                                FCPClient foreverClient = 
handler.getForeverClient(container);
+                               container.activate(foreverClient, 1);
                                
foreverClient.queuePendingMessagesOnConnectionRestart(handler.outputHandler, 
container);
                                
foreverClient.queuePendingMessagesFromRunningRequests(handler.outputHandler, 
container);
                                if(handler.getRebootClient().watchGlobal) {
@@ -52,6 +53,7 @@
                                        
globalForeverClient.queuePendingMessagesFromRunningRequests(handler.outputHandler,
 container);
                                }
                                handler.outputHandler.queue(new 
EndListPersistentRequestsMessage());
+                               container.deactivate(foreverClient, 1);
                        }

                }, NativeThread.HIGH_PRIORITY-1, false);

Modified: 
branches/db4o/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java     
2008-07-23 12:33:52 UTC (rev 21331)
+++ branches/db4o/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java     
2008-07-23 12:34:37 UTC (rev 21332)
@@ -78,6 +78,7 @@

                                public void run(ObjectContainer container, 
ClientContext context) {
                                        ClientRequest req = 
handler.getForeverRequest(global, handler, identifier, container);
+                                       container.activate(req, 1);
                                        if(req==null){
                                                Logger.error(this, "Huh ? the 
request is null!");
                                                ProtocolErrorMessage msg = new 
ProtocolErrorMessage(ProtocolErrorMessage.NO_SUCH_IDENTIFIER, false, null, 
identifier, global);
@@ -86,6 +87,7 @@
                                        } else {
                                                req.modifyRequest(clientToken, 
priorityClass, handler.server, container);
                                        }
+                                       container.deactivate(req, 1);
                                }

                        }, NativeThread.NORM_PRIORITY, false);