Author: toad
Date: 2008-01-17 23:48:32 +0000 (Thu, 17 Jan 2008)
New Revision: 17122
Modified:
trunk/freenet/src/freenet/client/async/SingleFileInserter.java
Log:
Simplify slightly.
Modified: trunk/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2008-01-17 23:41:06 UTC (rev 17121)
+++ trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2008-01-17 23:48:32 UTC (rev 17122)
@@ -173,21 +173,18 @@
result = comp.compress(origData,
ctx.persistentBucketFactory, origData.size());
if(result.size() <
oneBlockCompressedSize) {
bestCodec = comp;
- data = result;
if(bestCompressedData != null)
bestCompressedData.free();
- bestCompressedData = data;
+ bestCompressedData = result;
break;
}
if((bestCompressedData != null) &&
(result.size() < bestCompressedData.size())) {
bestCompressedData.free();
bestCompressedData = result;
- data = result;
bestCodec = comp;
} else if((bestCompressedData == null)
&& (result.size() < data.size())) {
bestCompressedData = result;
bestCodec = comp;
- data = result;
}
}
} catch (IOException e) {
@@ -197,6 +194,8 @@
throw new Error(e);
}
}
+ if(bestCompressedData != null)
+ data = bestCompressedData;
if(parent == cb) {
if(tryCompress)