Author: toad
Date: 2008-12-20 21:12:02 +0000 (Sat, 20 Dec 2008)
New Revision: 24687

Modified:
   branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
Prevent NPE


Modified: 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-12-20 17:54:40 UTC (rev 24686)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-12-20 21:12:02 UTC (rev 24687)
@@ -925,7 +925,7 @@
                                if(persistent)
                                        b.removeFrom(container);
                                dataBuckets[i] = null;
-                               if(persistent)
+                               if(persistent && dataKeys[i] != null)
                                        dataKeys[i].removeFrom(container);
                                dataKeys[i] = null;
                        }
@@ -940,7 +940,7 @@
                                if(persistent)
                                        b.removeFrom(container);
                                checkBuckets[i] = null;
-                               if(persistent)
+                               if(persistent && checkKeys[i] != null)
                                        checkKeys[i].removeFrom(container);
                                checkKeys[i] = null;
                        }

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

Reply via email to