Author: toad Date: 2008-11-18 19:23:21 +0000 (Tue, 18 Nov 2008) New Revision: 23739
Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcher.java Log: Revert 23733 and 23734: ditch horrible debugging cruft Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcher.java =================================================================== --- trunk/freenet/src/freenet/client/async/SplitFileFetcher.java 2008-11-18 19:18:08 UTC (rev 23738) +++ trunk/freenet/src/freenet/client/async/SplitFileFetcher.java 2008-11-18 19:23:21 UTC (rev 23739) @@ -3,7 +3,6 @@ * http://www.gnu.org/ for further details of the GPL. */ package freenet.client.async; -import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.util.LinkedList; @@ -23,8 +22,6 @@ import freenet.support.api.Bucket; import freenet.support.compress.CompressionOutputSizeException; import freenet.support.compress.Compressor; -import freenet.support.io.BucketTools; -import freenet.support.io.FileBucket; /** * Fetch a splitfile, decompress it if need be, and return it to the GetCompletionCallback. @@ -260,21 +257,11 @@ while(!decompressors.isEmpty()) { Compressor c = (Compressor) decompressors.removeLast(); long maxLen = Math.max(fetchContext.maxTempLength, fetchContext.maxOutputLength); - Bucket out; try { - out = returnBucket; + Bucket out = returnBucket; if(!decompressors.isEmpty()) out = null; - Bucket oldData = data; data = c.decompress(data, fetchContext.bucketFactory, maxLen, maxLen * 4, out); - File o = new File("not-broken."+System.currentTimeMillis()); - FileBucket dumpCopy = new FileBucket(o, false, false, false, false, false); - BucketTools.copy(oldData, dumpCopy); - System.err.println("Written not-broken copy to "+o); } catch (IOException e) { - File o = new File("broken."+System.currentTimeMillis()); - FileBucket dumpCopy = new FileBucket(o, false, false, false, false, false); - BucketTools.copy(data, dumpCopy); - System.err.println("Written broken copy to "+o); cb.onFailure(new FetchException(FetchException.BUCKET_ERROR, e), this); return; } catch (CompressionOutputSizeException e) { _______________________________________________ cvs mailing list [email protected] http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
