Author: toad
Date: 2009-02-21 13:51:30 +0000 (Sat, 21 Feb 2009)
New Revision: 25757
Modified:
branches/db4o/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
Log:
DOH! Blob buckets must still be encrypted, if we want persistent temp file
encryption!
This change will not break your existing node.db4o, however if you want
persistent temp file encryption you must delete it!
Modified:
branches/db4o/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
===================================================================
---
branches/db4o/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
2009-02-21 11:39:21 UTC (rev 25756)
+++
branches/db4o/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
2009-02-21 13:51:30 UTC (rev 25757)
@@ -134,15 +134,19 @@
public Bucket makeBucket(long size) throws IOException {
Bucket rawBucket = null;
+ boolean mustWrap = true;
if(size == BLOB_SIZE) {
// No need for a DelayedFreeBucket, we handle this
internally (and more efficiently) for blobs.
+ mustWrap = false;
rawBucket = blobFactory.makeBucket();
- if(rawBucket != null) return rawBucket;
}
if(rawBucket == null)
rawBucket = new
PersistentTempFileBucket(fg.makeRandomFilename(), fg);
- Bucket maybeEncryptedBucket = (encrypt ? new
PaddedEphemerallyEncryptedBucket(rawBucket, 1024, strongPRNG, weakPRNG) :
rawBucket);
- return new DelayedFreeBucket(this, maybeEncryptedBucket);
+ if(encrypt)
+ rawBucket = new
PaddedEphemerallyEncryptedBucket(rawBucket, 1024, strongPRNG, weakPRNG);
+ if(mustWrap)
+ rawBucket = new DelayedFreeBucket(this, rawBucket);
+ return rawBucket;
}
/**
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
