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

[t...@freenetproject.org]

Author: toad
Date: 2008-06-25 17:24:37 +0000 (Wed, 25 Jun 2008)
New Revision: 20698

Modified:
   branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
Log:
Hopefully fix NPE in WatchGlobal

Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java   2008-06-25 
16:52:31 UTC (rev 20697)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java   2008-06-25 
17:24:37 UTC (rev 20698)
@@ -244,8 +244,10 @@
                        server.globalForeverClient.watch(this);
                        FCPConnectionHandler connHandler = getConnection();
                        if(connHandler != null) {
-                               
server.globalRebootClient.queuePendingMessagesOnConnectionRestart(connHandler.outputHandler,
 container);
-                               
server.globalForeverClient.queuePendingMessagesOnConnectionRestart(connHandler.outputHandler,
 container);
+                               if(persistenceType == 
ClientRequest.PERSIST_REBOOT)
+                                       
server.globalRebootClient.queuePendingMessagesOnConnectionRestart(connHandler.outputHandler,
 container);
+                               else
+                                       
server.globalForeverClient.queuePendingMessagesOnConnectionRestart(connHandler.outputHandler,
 container);
                        }
                        watchGlobal = true;
                }