Author: toad
Date: 2009-02-26 18:14:57 +0000 (Thu, 26 Feb 2009)
New Revision: 25834
Modified:
trunk/freenet/
trunk/freenet/src/freenet/client/
trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java
Log:
Merge 25290 from db4o branch, NullBucket is valid here, treat as direct
Property changes on: trunk/freenet
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/db4o:25594
/branches/db4o/freenet:24785,25282,25332,25351-25352,25479,25488,25540,25594
+ /branches/db4o:25594
/branches/db4o/freenet:24785,25282,25290,25332,25351-25352,25479,25488,25540,25594
Property changes on: trunk/freenet/src/freenet/client
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/db4o/freenet/src/freenet/client:24785,25282,25332,25351-25353,25479,25488,25540,25594
/branches/db4o/src/freenet/client:25594
+
/branches/db4o/freenet/src/freenet/client:24785,25282,25290,25332,25351-25353,25479,25488,25540,25594
/branches/db4o/src/freenet/client:25594
Modified: trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java 2009-02-26
02:47:50 UTC (rev 25833)
+++ trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java 2009-02-26
18:14:57 UTC (rev 25834)
@@ -14,6 +14,7 @@
import freenet.support.api.Bucket;
import freenet.support.io.DelayedFreeBucket;
import freenet.support.io.FileBucket;
+import freenet.support.io.NullBucket;
import freenet.support.io.PaddedEphemerallyEncryptedBucket;
public class PersistentPutDir extends FCPMessage {
@@ -90,7 +91,7 @@
} else if(data instanceof FileBucket) {
subset.putSingle("UploadFrom", "disk");
subset.putSingle("Filename",
((FileBucket)data).getFile().getPath());
- } else if (data instanceof
PaddedEphemerallyEncryptedBucket) {
+ } else if (data instanceof
PaddedEphemerallyEncryptedBucket || data instanceof NullBucket) {
subset.putSingle("UploadFrom",
"direct");
} else {
throw new IllegalStateException("Don't
know what to do with bucket: "+data);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
