Author: TheSeeker
Date: 2008-10-15 16:02:09 +0000 (Wed, 15 Oct 2008)
New Revision: 22986

Modified:
   branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java
Log:
Same issue as 22983, NPE on startup due to null fetchcontexts.  Still no idea 
why the fetchcontext is null sometimes.

Modified: branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java        
2008-10-14 17:42:02 UTC (rev 22985)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java        
2008-10-15 16:02:09 UTC (rev 22986)
@@ -571,12 +571,12 @@
                                container.deactivate(mainBloomFile, 1);
                                container.deactivate(altBloomFile, 1);
                                container.activate(fetchContext, 1);
-                               cacheLocalRequests = 
fetchContext.cacheLocalRequests;
+                               cacheLocalRequests = fetchContext == null ? 
false : fetchContext.cacheLocalRequests; //TheSeeker - same problem as 22983
                                container.deactivate(fetchContext, 1);
                        } else {
                                main = null;
                                alt = null;
-                               cacheLocalRequests = 
fetchContext.cacheLocalRequests;
+                               cacheLocalRequests = fetchContext == null ? 
false : fetchContext.cacheLocalRequests; //TheSeeker - same problem as 22983
                        }
                        try {
                                if(Logger.shouldLog(Logger.MINOR, this))


Reply via email to