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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-25 10:57:18 +0000 (Fri, 25 Jul 2008)
New Revision: 21392

Modified:
   branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
Log:
Paranoia

Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java   2008-07-25 
10:45:58 UTC (rev 21391)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java   2008-07-25 
10:57:18 UTC (rev 21392)
@@ -205,6 +205,16 @@

        public boolean hasPersistentRequests(ObjectContainer container) {
                assert((persistenceType == ClientRequest.PERSIST_FOREVER) == 
(container != null));
+               if(runningPersistentRequests == null) {
+                       if(!container.ext().isActive(this))
+                               Logger.error(this, "FCPCLIENT NOT ACTIVE!!!");
+                       throw new NullPointerException();
+               }
+               if(completedUnackedRequests == null) {
+                       if(!container.ext().isActive(this))
+                               Logger.error(this, "FCPCLIENT NOT ACTIVE!!!");
+                       throw new NullPointerException();
+               }
                return !(runningPersistentRequests.isEmpty() && 
completedUnackedRequests.isEmpty());
        }