[freenet-cvs] r9698 - trunk/freenet/src/freenet/node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2006-07-21 17:27:46 +0000 (Fri, 21 Jul 2006)
New Revision: 9698

Modified:
   trunk/freenet/src/freenet/node/fcp/ClientPut.java
   trunk/freenet/src/freenet/node/fcp/PersistentPut.java
Log:
Fix #554.

Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java   2006-07-21 17:17:18 UTC 
(rev 9697)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java   2006-07-21 17:27:46 UTC 
(rev 9698)
@@ -200,7 +200,7 @@
        protected FCPMessage persistentTagMessage() {
                return new PersistentPut(identifier, uri, verbosity, 
priorityClass, uploadFrom, targetURI, 
                                persistenceType, origFilename, 
clientMetadata.getMIMEType(), client.isGlobalQueue,
-                               data == null ? -1 : data.size());
+                               data == null ? -1 : data.size(), clientToken);
        }

        protected String getTypeName() {

Modified: trunk/freenet/src/freenet/node/fcp/PersistentPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentPut.java       2006-07-21 
17:17:18 UTC (rev 9697)
+++ trunk/freenet/src/freenet/node/fcp/PersistentPut.java       2006-07-21 
17:27:46 UTC (rev 9698)
@@ -21,11 +21,12 @@
        final boolean global;
        final FreenetURI targetURI;
        final long size;
+       final String token;

        public PersistentPut(String identifier, FreenetURI uri, int verbosity, 
                        short priorityClass, short uploadFrom, FreenetURI 
targetURI, 
                        short persistenceType, File origFilename, String 
mimeType, 
-                       boolean global, long size) {
+                       boolean global, long size, String clientToken) {
                this.identifier = identifier;
                this.uri = uri;
                this.verbosity = verbosity;
@@ -37,6 +38,7 @@
                this.mimeType = mimeType;
                this.global = global;
                this.size = size;
+               this.token = clientToken;
        }

        public SimpleFieldSet getFieldSet() {
@@ -56,6 +58,8 @@
                fs.put("Global", Boolean.toString(global));
                if(size != -1)
                        fs.put("DataLength", size);
+               if(token != null)
+                       fs.put("ClientToken", token);
                return fs;
        }