Author: toad
Date: 2008-12-19 17:58:37 +0000 (Fri, 19 Dec 2008)
New Revision: 24624

Modified:
   branches/db4o/freenet/src/freenet/client/async/DatastoreChecker.java
Log:
Fix NPE


Modified: branches/db4o/freenet/src/freenet/client/async/DatastoreChecker.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/DatastoreChecker.java        
2008-12-19 17:58:27 UTC (rev 24623)
+++ branches/db4o/freenet/src/freenet/client/async/DatastoreChecker.java        
2008-12-19 17:58:37 UTC (rev 24624)
@@ -113,6 +113,12 @@
                        for(DatastoreCheckerItem item : results) {
                                if(item.chosenBy == context.bootID) continue;
                                SendableGet getter = item.getter;
+                               if(getter == null) {
+                                       // FIXME is this normal or isn't it? 
Probably ... if we don't always delete the DCI's ...
+                                       if(logMINOR) Logger.minor(this, 
"Ignoring DatastoreCheckerItem because the SendableGet has already been deleted 
from the database");
+                                       container.delete(item);
+                                       continue;
+                               }
                                BlockSet blocks = item.blocks;
                                container.activate(getter, 1);
                                boolean dontCache = getter.dontCache();

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to