[freenet-cvs] r21035 - branches/db4o/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-07-10 19:41:33 +0000 (Thu, 10 Jul 2008)
New Revision: 21035

Modified:
   branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
   
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
Log:
Another NPE fix

Modified: 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-07-10 19:35:45 UTC (rev 21034)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-07-10 19:41:33 UTC (rev 21035)
@@ -593,7 +593,9 @@
                                if(sub.retryCount == retryCount) return sub;
                        }
                        if(noCreate) return null;
-                       sub = new SplitFileFetcherSubSegment(this, retryCount);
+                       if(persistent)
+                               container.activate(parent, 1);
+                       sub = new SplitFileFetcherSubSegment(this, parent, 
retryCount);
                        subSegments.add(sub);
                }
                if(persistent)

Modified: 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java  
    2008-07-10 19:35:45 UTC (rev 21034)
+++ 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java  
    2008-07-10 19:41:33 UTC (rev 21035)
@@ -49,8 +49,8 @@
        private static boolean logMINOR;
        private boolean cancelled;

-       SplitFileFetcherSubSegment(SplitFileFetcherSegment segment, int 
retryCount) {
-               super(segment.parent);
+       SplitFileFetcherSubSegment(SplitFileFetcherSegment segment, 
ClientRequester parent, int retryCount) {
+               super(parent);
                this.segment = segment;
                this.retryCount = retryCount;
                this.parent = segment.parent;