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

[t...@freenetproject.org]

Author: toad
Date: 2008-06-16 16:20:51 +0000 (Mon, 16 Jun 2008)
New Revision: 20365

Modified:
   branches/db4o/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java
Log:
Send the EndListPersistentRequestsMessage at the right point.

Modified: 
branches/db4o/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java   
    2008-06-16 16:20:05 UTC (rev 20364)
+++ 
branches/db4o/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java   
    2008-06-16 16:20:51 UTC (rev 20365)
@@ -32,6 +32,14 @@

                FCPClient rebootClient = handler.getRebootClient();

+               
rebootClient.queuePendingMessagesOnConnectionRestart(handler.outputHandler, 
null);
+               
rebootClient.queuePendingMessagesFromRunningRequests(handler.outputHandler, 
null);
+               if(handler.getRebootClient().watchGlobal) {
+                       FCPClient globalRebootClient = 
handler.server.globalRebootClient;
+                       
globalRebootClient.queuePendingMessagesOnConnectionRestart(handler.outputHandler,
 null);
+                       
globalRebootClient.queuePendingMessagesFromRunningRequests(handler.outputHandler,
 null);
+               }
+               
                node.clientCore.clientContext.jobRunner.queue(new DBJob() {

                        public void run(ObjectContainer container, 
ClientContext context) {
@@ -43,17 +51,10 @@
                                        
globalForeverClient.queuePendingMessagesOnConnectionRestart(handler.outputHandler,
 container);
                                        
globalForeverClient.queuePendingMessagesFromRunningRequests(handler.outputHandler,
 container);
                                }
+                               handler.outputHandler.queue(new 
EndListPersistentRequestsMessage());
                        }

                }, NativeThread.NORM_PRIORITY, false);
-               
rebootClient.queuePendingMessagesOnConnectionRestart(handler.outputHandler, 
null);
-               
rebootClient.queuePendingMessagesFromRunningRequests(handler.outputHandler, 
null);
-               if(handler.getRebootClient().watchGlobal) {
-                       FCPClient globalRebootClient = 
handler.server.globalRebootClient;
-                       
globalRebootClient.queuePendingMessagesOnConnectionRestart(handler.outputHandler,
 null);
-                       
globalRebootClient.queuePendingMessagesFromRunningRequests(handler.outputHandler,
 null);
-               }
-               handler.outputHandler.queue(new 
EndListPersistentRequestsMessage());
        }

 }