Author: toad
Date: 2008-12-17 18:04:56 +0000 (Wed, 17 Dec 2008)
New Revision: 24449
Modified:
branches/db4o/freenet/src/freenet/client/async/InsertCompressor.java
Log:
Fix merge bug causing inserts to fail to start
Modified: branches/db4o/freenet/src/freenet/client/async/InsertCompressor.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/InsertCompressor.java
2008-12-17 17:08:30 UTC (rev 24448)
+++ branches/db4o/freenet/src/freenet/client/async/InsertCompressor.java
2008-12-17 18:04:56 UTC (rev 24449)
@@ -143,11 +143,12 @@
bestCompressedData = result;
bestCompressedDataSize = resultSize;
bestCodec = comp;
+ shouldFreeOnFinally = false;
}
} catch(CompressionOutputSizeException e) {
continue; // try next compressor
type
} finally {
- if(shouldFreeOnFinally && (result !=
null))
+ if(shouldFreeOnFinally && (result !=
null) && result != origData)
result.free();
}
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
