Author: toad
Date: 2006-04-01 14:17:26 +0000 (Sat, 01 Apr 2006)
New Revision: 8422
Added:
trunk/freenet/src/freenet/node/fcp/GetRequestStatusMessage.java
Removed:
trunk/freenet/src/freenet/node/fcp/GetResultsMessage.java
Modified:
trunk/freenet/src/freenet/node/Version.java
trunk/freenet/src/freenet/node/fcp/FCPMessage.java
Log:
606: GetResults -> GetRequestStatus
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-04-01 14:09:19 UTC (rev
8421)
+++ trunk/freenet/src/freenet/node/Version.java 2006-04-01 14:17:26 UTC (rev
8422)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 605;
+ private static final int buildNumber = 606;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 591;
Modified: trunk/freenet/src/freenet/node/fcp/FCPMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPMessage.java 2006-04-01 14:09:19 UTC
(rev 8421)
+++ trunk/freenet/src/freenet/node/fcp/FCPMessage.java 2006-04-01 14:17:26 UTC
(rev 8422)
@@ -52,8 +52,8 @@
return new ClientPutComplexDirMessage(fs, bfTemp,
bfPersistent);
if(name.equals(SubscribeUSKMessage.name))
return new SubscribeUSKMessage(fs);
- if(name.equals(GetResultsMessage.name))
- return new GetResultsMessage(fs);
+ if(name.equals(GetRequestStatusMessage.name))
+ return new GetRequestStatusMessage(fs);
if(name.equals("Void"))
return null;
throw new
MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "Unknown message
name "+name, null);
Copied: trunk/freenet/src/freenet/node/fcp/GetRequestStatusMessage.java (from
rev 8421, trunk/freenet/src/freenet/node/fcp/GetResultsMessage.java)
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetResultsMessage.java 2006-04-01
14:09:19 UTC (rev 8421)
+++ trunk/freenet/src/freenet/node/fcp/GetRequestStatusMessage.java
2006-04-01 14:17:26 UTC (rev 8422)
@@ -0,0 +1,44 @@
+package freenet.node.fcp;
+
+import freenet.node.Node;
+import freenet.support.Fields;
+import freenet.support.SimpleFieldSet;
+
+public class GetRequestStatusMessage extends FCPMessage {
+
+ final String identifier;
+ final boolean global;
+ final static String name = "GetRequestStatus";
+
+ public GetRequestStatusMessage(SimpleFieldSet fs) {
+ this.identifier = fs.get("Identifier");
+ this.global = Fields.stringToBool(fs.get("Global"), false);
+ }
+
+ public SimpleFieldSet getFieldSet() {
+ SimpleFieldSet fs = new SimpleFieldSet(true);
+ fs.put("Identifier", identifier);
+ return fs;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void run(FCPConnectionHandler handler, Node node)
+ throws MessageInvalidException {
+ ClientRequest req;
+ if(global)
+ req =
handler.server.globalClient.getRequest(identifier);
+ else
+ req = (ClientRequest)
+ handler.getClient().getRequest(identifier);
+ if(req == null) {
+ ProtocolErrorMessage msg = new
ProtocolErrorMessage(ProtocolErrorMessage.NO_SUCH_IDENTIFIER, false, null,
identifier);
+ handler.outputHandler.queue(msg);
+ } else {
+ req.sendPendingMessages(handler.outputHandler, true,
true);
+ }
+ }
+
+}
Deleted: trunk/freenet/src/freenet/node/fcp/GetResultsMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetResultsMessage.java 2006-04-01
14:09:19 UTC (rev 8421)
+++ trunk/freenet/src/freenet/node/fcp/GetResultsMessage.java 2006-04-01
14:17:26 UTC (rev 8422)
@@ -1,44 +0,0 @@
-package freenet.node.fcp;
-
-import freenet.node.Node;
-import freenet.support.Fields;
-import freenet.support.SimpleFieldSet;
-
-public class GetResultsMessage extends FCPMessage {
-
- final String identifier;
- final boolean global;
- final static String name = "GetResults";
-
- public GetResultsMessage(SimpleFieldSet fs) {
- this.identifier = fs.get("Identifier");
- this.global = Fields.stringToBool(fs.get("Global"), false);
- }
-
- public SimpleFieldSet getFieldSet() {
- SimpleFieldSet fs = new SimpleFieldSet(true);
- fs.put("Identifier", identifier);
- return fs;
- }
-
- public String getName() {
- return name;
- }
-
- public void run(FCPConnectionHandler handler, Node node)
- throws MessageInvalidException {
- ClientRequest req;
- if(global)
- req =
handler.server.globalClient.getRequest(identifier);
- else
- req = (ClientRequest)
- handler.getClient().getRequest(identifier);
- if(req == null) {
- ProtocolErrorMessage msg = new
ProtocolErrorMessage(ProtocolErrorMessage.NO_SUCH_IDENTIFIER, false, null,
identifier);
- handler.outputHandler.queue(msg);
- } else {
- req.sendPendingMessages(handler.outputHandler, true,
true);
- }
- }
-
-}
