Author: nextgens
Date: 2006-06-14 13:25:52 +0000 (Wed, 14 Jun 2006)
New Revision: 9196
Modified:
trunk/freenet/src/freenet/node/Version.java
trunk/freenet/src/freenet/node/fcp/ClientRequest.java
Log:
812: Every FCP request going to the global queue will have a maximum verbosity
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-06-14 12:01:00 UTC (rev
9195)
+++ trunk/freenet/src/freenet/node/Version.java 2006-06-14 13:25:52 UTC (rev
9196)
@@ -18,7 +18,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 811;
+ private static final int buildNumber = 812;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 765;
Modified: trunk/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientRequest.java 2006-06-14
12:01:00 UTC (rev 9195)
+++ trunk/freenet/src/freenet/node/fcp/ClientRequest.java 2006-06-14
13:25:52 UTC (rev 9196)
@@ -44,7 +44,10 @@
FCPClient client, short priorityClass2, short
persistenceType2, String clientToken2, boolean global) {
this.uri = uri2;
this.identifier = identifier2;
- this.verbosity = verbosity2;
+ if(global)
+ this.verbosity = Integer.MAX_VALUE;
+ else
+ this.verbosity = verbosity2;
this.finished = false;
this.priorityClass = priorityClass2;
this.persistenceType = persistenceType2;
@@ -61,7 +64,10 @@
short priorityClass2, short persistenceType2, String
clientToken2, boolean global) {
this.uri = uri2;
this.identifier = identifier2;
- this.verbosity = verbosity2;
+ if(global)
+ this.verbosity = Integer.MAX_VALUE;
+ else
+ this.verbosity = verbosity2;
this.finished = false;
this.priorityClass = priorityClass2;
this.persistenceType = persistenceType2;
@@ -81,6 +87,7 @@
public ClientRequest(SimpleFieldSet fs, FCPClient client2) throws
MalformedURLException {
uri = new FreenetURI(fs.get("URI"));
identifier = fs.get("Identifier");
+ // We don't force the verbosity even if the request is meant to
go on the global queue
verbosity = Integer.parseInt(fs.get("Verbosity"));
persistenceType =
ClientRequest.parsePersistence(fs.get("Persistence"));
if(persistenceType == ClientRequest.PERSIST_CONNECTION)
