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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-11 13:03:30 +0000 (Fri, 11 Jul 2008)
New Revision: 21056

Modified:
   branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java
   branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
More activation

Modified: branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java        
2008-07-11 13:01:50 UTC (rev 21055)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java        
2008-07-11 13:03:30 UTC (rev 21056)
@@ -288,7 +288,6 @@

        private void finish(ObjectContainer container, ClientContext context) {
                if(persistent) {
-                       container.activate(this, 1);
                        container.activate(cb, 1);
                }
                try {

Modified: 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-07-11 13:01:50 UTC (rev 21055)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-07-11 13:03:30 UTC (rev 21056)
@@ -423,8 +423,10 @@
                                checkKeys[i] = null;
                        }
                }
-               if(persistent)
+               if(persistent) {
                        container.set(this);
+                       container.activate(parentFetcher, 1);
+               }
                // Defer the completion until we have generated healing blocks 
if we are collecting binary blobs.
                if(isCollectingBinaryBlob())
                        
parentFetcher.segmentFinished(SplitFileFetcherSegment.this, container, context);
@@ -636,8 +638,10 @@
                }
                context.getChkFetchScheduler().removePendingKeys(this, true);
                removeSubSegments(container);
-               if(persistent)
+               if(persistent) {
                        container.set(this);
+                       container.activate(parentFetcher, 1);
+               }
                parentFetcher.segmentFinished(this, container, context);
        }