Author: toad
Date: 2007-05-23 15:45:48 +0000 (Wed, 23 May 2007)
New Revision: 13332
Modified:
trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java
trunk/freenet/src/freenet/node/fcp/ClientPutDirMessage.java
trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java
trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java
Log:
URI_PARSE_ERROR -> FREENET_URI_PARSE_ERROR. Versus URL_PARSE_ERROR which is for
a non-freenet URL
Modified: trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java 2007-05-23
15:17:02 UTC (rev 13331)
+++ trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java 2007-05-23
15:45:48 UTC (rev 13332)
@@ -73,7 +73,7 @@
try {
uri = new FreenetURI(fs.get("URI"));
} catch (MalformedURLException e) {
- throw new
MessageInvalidException(ProtocolErrorMessage.URI_PARSE_ERROR, e.getMessage(),
identifier, global);
+ throw new
MessageInvalidException(ProtocolErrorMessage.FREENET_URI_PARSE_ERROR,
e.getMessage(), identifier, global);
}
String verbosityString = fs.get("Verbosity");
if(verbosityString == null)
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutDirMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutDirMessage.java 2007-05-23
15:17:02 UTC (rev 13331)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutDirMessage.java 2007-05-23
15:45:48 UTC (rev 13332)
@@ -61,7 +61,7 @@
uu = uu.setMetaString(null);
uri = uu;
} catch (MalformedURLException e) {
- throw new
MessageInvalidException(ProtocolErrorMessage.URI_PARSE_ERROR, e.getMessage(),
identifier, global);
+ throw new
MessageInvalidException(ProtocolErrorMessage.FREENET_URI_PARSE_ERROR,
e.getMessage(), identifier, global);
}
String verbosityString = fs.get("Verbosity");
if(verbosityString == null)
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java 2007-05-23
15:17:02 UTC (rev 13331)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java 2007-05-23
15:45:48 UTC (rev 13332)
@@ -87,7 +87,7 @@
} // if >1, will fail later
uri = uu;
} catch (MalformedURLException e) {
- throw new
MessageInvalidException(ProtocolErrorMessage.URI_PARSE_ERROR, e.getMessage(),
identifier, global);
+ throw new
MessageInvalidException(ProtocolErrorMessage.FREENET_URI_PARSE_ERROR,
e.getMessage(), identifier, global);
}
String verbosityString = fs.get("Verbosity");
if(verbosityString == null)
Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2007-05-23 15:17:02 UTC (rev 13331)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2007-05-23 15:45:48 UTC (rev 13332)
@@ -217,7 +217,7 @@
outputHandler.queue(new
ProtocolErrorMessage(e.protocolCode, false, e.getMessage(), e.ident, false));
return;
} catch (MalformedURLException e) {
- failedMessage = new
ProtocolErrorMessage(ProtocolErrorMessage.URI_PARSE_ERROR, true, null, id,
message.global);
+ failedMessage = new
ProtocolErrorMessage(ProtocolErrorMessage.FREENET_URI_PARSE_ERROR, true, null,
id, message.global);
}
if(!persistent)
requestsByIdentifier.put(id, cp);
@@ -263,7 +263,7 @@
} catch (IdentifierCollisionException e) {
success = false;
} catch (MalformedURLException e) {
- failedMessage = new
ProtocolErrorMessage(ProtocolErrorMessage.URI_PARSE_ERROR, true, null, id,
message.global);
+ failedMessage = new
ProtocolErrorMessage(ProtocolErrorMessage.FREENET_URI_PARSE_ERROR, true, null,
id, message.global);
}
if(!persistent)
requestsByIdentifier.put(id, cp);
Modified: trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java
2007-05-23 15:17:02 UTC (rev 13331)
+++ trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java
2007-05-23 15:45:48 UTC (rev 13332)
@@ -25,7 +25,7 @@
static final int CLIENT_HELLO_MUST_BE_FIRST_MESSAGE = 1;
static final int NO_LATE_CLIENT_HELLOS = 2;
static final int MESSAGE_PARSE_ERROR = 3;
- static final int URI_PARSE_ERROR = 4;
+ static final int FREENET_URI_PARSE_ERROR = 4;
static final int MISSING_FIELD = 5;
static final int ERROR_PARSING_NUMBER = 6;
static final int INVALID_MESSAGE = 7;
@@ -66,8 +66,8 @@
return "No late ClientHello's accepted";
case MESSAGE_PARSE_ERROR:
return "Unknown message parsing error";
- case URI_PARSE_ERROR:
- return "Error parsing URI";
+ case FREENET_URI_PARSE_ERROR:
+ return "Error parsing freenet URI";
case MISSING_FIELD:
return "Missing field";
case ERROR_PARSING_NUMBER:
