Author: toad
Date: 2009-04-18 14:07:54 +0000 (Sat, 18 Apr 2009)
New Revision: 26972

Modified:
   trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
Fix NPE


Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2009-04-18 14:02:54 UTC (rev 26971)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2009-04-18 14:07:54 UTC (rev 26972)
@@ -1492,8 +1492,6 @@
                                if(persistent)
                                        container.deactivate(checkSeg, 1);
                        }
-                       if(persistent)
-                               container.deactivate(seg, 1);
                        try {
                                cb = new ClientCHKBlock((CHKBlock)block, ckey);
                        } catch (CHKVerifyException e) {
@@ -1520,6 +1518,8 @@
                }
                if(killSeg)
                        seg.kill(container, context, true, true);
+               if(persistent)
+                       container.deactivate(seg, 1);
                if(fatal != null) {
                        this.onFatalFailure(fatal, blockNum, null, container, 
context);
                        return false;

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

Reply via email to