Author: toad
Date: 2008-06-27 21:20:55 +0000 (Fri, 27 Jun 2008)
New Revision: 20825

Modified:
   branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java
Log:
Activation related to decompressing splitfiles

Modified: branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java        
2008-06-27 19:43:01 UTC (rev 20824)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcher.java        
2008-06-27 21:20:55 UTC (rev 20825)
@@ -201,10 +201,17 @@
                long bytesWritten = 0;
                OutputStream os = null;
                Bucket output;
+               if(persistent) {
+                       container.activate(decompressors, 5);
+                       if(returnBucket != null)
+                               container.activate(returnBucket, 5);
+               }
                try {
-                       if((returnBucket != null) && decompressors.isEmpty())
+                       if((returnBucket != null) && decompressors.isEmpty()) {
                                output = returnBucket;
-                       else
+                               if(persistent)
+                                       container.activate(output, 5);
+                       } else
                                output = 
context.getBucketFactory(parent.persistent()).makeBucket(finalLength);
                        os = output.getOutputStream();
                        for(int i=0;i<segments.length;i++) {
@@ -277,7 +284,9 @@
                        // Decompress
                        if(persistent) {
                                container.set(this);
-                               container.activate(decompressors, 1);
+                               container.activate(decompressors, 5);
+                               container.activate(returnBucket, 5);
+                               container.activate(cb, 1);
                        }
                        while(!decompressors.isEmpty()) {
                                Compressor c = (Compressor) 
decompressors.removeLast();

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

Reply via email to