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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-12-01 00:02:24 +0000 (Sat, 01 Dec 2007)
New Revision: 16171

Modified:
   trunk/freenet/src/freenet/node/fcp/ClientGet.java
   trunk/freenet/src/freenet/node/fcp/PersistentGet.java
Log:
Resolve #1889: PersistentGet fields missing

Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java   2007-11-30 23:59:55 UTC 
(rev 16170)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java   2007-12-01 00:02:24 UTC 
(rev 16171)
@@ -494,7 +494,7 @@
        }

        protected FCPMessage persistentTagMessage() {
-               return new PersistentGet(identifier, uri, verbosity, 
priorityClass, returnType, persistenceType, targetFile, tempFile, clientToken, 
client.isGlobalQueue, started, fctx.maxNonSplitfileRetries);
+               return new PersistentGet(identifier, uri, verbosity, 
priorityClass, returnType, persistenceType, targetFile, tempFile, clientToken, 
client.isGlobalQueue, started, fctx.maxNonSplitfileRetries, binaryBlob, 
fctx.maxOutputLength);
        }

        public void onFailure(FetchException e, ClientGetter state) {

Modified: trunk/freenet/src/freenet/node/fcp/PersistentGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentGet.java       2007-11-30 
23:59:55 UTC (rev 16170)
+++ trunk/freenet/src/freenet/node/fcp/PersistentGet.java       2007-12-01 
00:02:24 UTC (rev 16171)
@@ -30,10 +30,12 @@
        final boolean global;
        final boolean started;
        final int maxRetries;
+       final boolean binaryBlob;
+       final long maxSize;

        public PersistentGet(String identifier, FreenetURI uri, int verbosity, 
                        short priorityClass, short returnType, short 
persistenceType, 
-                       File targetFile, File tempFile, String clientToken, 
boolean global, boolean started, int maxRetries) {
+                       File targetFile, File tempFile, String clientToken, 
boolean global, boolean started, int maxRetries, boolean binaryBlob, long 
maxSize) {
                this.identifier = identifier;
                this.uri = uri;
                this.verbosity = verbosity;
@@ -46,6 +48,8 @@
                this.global = global;
                this.started = started;
                this.maxRetries = maxRetries;
+               this.binaryBlob = binaryBlob;
+               this.maxSize = maxSize;
        }

        public SimpleFieldSet getFieldSet() {
@@ -65,6 +69,8 @@
                fs.put("Global", global);
                fs.put("Started", started);
                fs.put("MaxRetries", maxRetries);
+               fs.put("BinaryBlob", binaryBlob);
+               fs.put("MaxSize", maxSize);
                return fs;
        }