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

[t...@freenetproject.org]

Author: toad
Date: 2008-10-22 12:27:34 +0000 (Wed, 22 Oct 2008)
New Revision: 23026

Modified:
   branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
Log:
Check for cancelled.
Logging.


Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java       
2008-10-22 12:26:54 UTC (rev 23025)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java       
2008-10-22 12:27:34 UTC (rev 23026)
@@ -281,6 +281,8 @@
                        container.activate(returnBucket, 5);
                }
                synchronized(this) {
+                       if(cancelled)
+                               return;
                        // So a SingleKeyListener isn't created.
                        finished = true;
                }
@@ -636,8 +638,13 @@

                                SplitFileFetcher sf = new 
SplitFileFetcher(metadata, rcb, parent, ctx, 
                                                decompressors, clientMetadata, 
actx, recursionLevel, returnBucket, token, container, context);
-                               if(persistent)
+                               if(persistent) {
                                        container.store(sf); // Avoid problems 
caused by storing a deactivated sf
+                                       if(!container.ext().isActive(parent)) {
+                                               container.activate(parent, 1);
+                                               Logger.error(this, "Not active: 
"+parent);
+                                       }
+                               }
                                parent.onTransition(this, sf, container);
                                try {
                                        sf.schedule(container, context);