[freenet-cvs] r7908 - branches/async-client/src/freenet/node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2006-01-24 00:05:09 +0000 (Tue, 24 Jan 2006)
New Revision: 7908

Modified:
   branches/async-client/src/freenet/node/fcp/ClientGetMessage.java
   branches/async-client/src/freenet/node/fcp/ClientPutMessage.java
Log:
Merge diffs from 7676-7889, which somehow got missed out.

Modified: branches/async-client/src/freenet/node/fcp/ClientGetMessage.java
===================================================================
--- branches/async-client/src/freenet/node/fcp/ClientGetMessage.java    
2006-01-23 23:48:08 UTC (rev 7907)
+++ branches/async-client/src/freenet/node/fcp/ClientGetMessage.java    
2006-01-24 00:05:09 UTC (rev 7908)
@@ -18,7 +18,7 @@
  * Identifier=Request Number One
  * Verbosity=0 // no status, just tell us when it's done
  * ReturnType=direct // return all at once over the FCP connection
- * MaxSize=100 // maximum size of returned data (all numbers in hex)
+ * MaxSize=100 // maximum size of returned data 
  * MaxTempSize=1000 // maximum size of intermediary data
  * MaxRetries=100 // automatic retry supported as an option
  * EndMessage
@@ -55,7 +55,7 @@
                        verbosity = 0;
                else {
                        try {
-                               verbosity = Integer.parseInt(verbosityString, 
16);
+                               verbosity = Integer.parseInt(verbosityString, 
10);
                        } catch (NumberFormatException e) {
                                throw new 
MessageInvalidException(ProtocolErrorMessage.ERROR_PARSING_NUMBER, "Error 
parsing Verbosity field: "+e.getMessage());
                        }
@@ -71,7 +71,7 @@
                        maxSize = Long.MAX_VALUE;
                else {
                        try {
-                               maxSize = Long.parseLong(maxSizeString, 16);
+                               maxSize = Long.parseLong(maxSizeString, 10);
                        } catch (NumberFormatException e) {
                                throw new 
MessageInvalidException(ProtocolErrorMessage.ERROR_PARSING_NUMBER, "Error 
parsing MaxSize field: "+e.getMessage());
                        }
@@ -82,7 +82,7 @@
                        maxTempSize = Long.MAX_VALUE;
                else {
                        try {
-                               maxTempSize = Long.parseLong(maxTempSizeString, 
16);
+                               maxTempSize = Long.parseLong(maxTempSizeString, 
10);
                        } catch (NumberFormatException e) {
                                throw new 
MessageInvalidException(ProtocolErrorMessage.ERROR_PARSING_NUMBER, "Error 
parsing MaxSize field: "+e.getMessage());
                        }
@@ -93,7 +93,7 @@
                        maxRetries = 0;
                else {
                        try {
-                               maxRetries = Integer.parseInt(maxRetriesString, 
16);
+                               maxRetries = Integer.parseInt(maxRetriesString, 
10);
                        } catch (NumberFormatException e) {
                                throw new 
MessageInvalidException(ProtocolErrorMessage.ERROR_PARSING_NUMBER, "Error 
parsing MaxSize field: "+e.getMessage());
                        }

Modified: branches/async-client/src/freenet/node/fcp/ClientPutMessage.java
===================================================================
--- branches/async-client/src/freenet/node/fcp/ClientPutMessage.java    
2006-01-23 23:48:08 UTC (rev 7907)
+++ branches/async-client/src/freenet/node/fcp/ClientPutMessage.java    
2006-01-24 00:05:09 UTC (rev 7908)
@@ -11,7 +11,7 @@
  * ClientPut
  * URI=CHK@ // could as easily be an insertable SSK URI
  * Metadata.ContentType=text/html
- * DataLength=19000 // hex for 100kB
+ * DataLength=100 // 100kB
  * Identifier=Insert-1 // identifier, as always
  * Verbosity=0 // just report when complete
  * MaxRetries=999999 // lots of retries
@@ -45,7 +45,7 @@
                        verbosity = 0;
                else {
                        try {
-                               verbosity = Integer.parseInt(verbosityString, 
16);
+                               verbosity = Integer.parseInt(verbosityString, 
10);
                        } catch (NumberFormatException e) {
                                throw new 
MessageInvalidException(ProtocolErrorMessage.ERROR_PARSING_NUMBER, "Error 
parsing Verbosity field: "+e.getMessage());
                        }
@@ -54,7 +54,7 @@
                if(dataLengthString == null)
                        throw new 
MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "Need DataLength on 
a ClientPut");
                try {
-                       dataLength = Long.parseLong(dataLengthString, 16);
+                       dataLength = Long.parseLong(dataLengthString, 10);
                } catch (NumberFormatException e) {
                        throw new 
MessageInvalidException(ProtocolErrorMessage.ERROR_PARSING_NUMBER, "Error 
parsing DataLength field: "+e.getMessage());
                }
@@ -65,7 +65,7 @@
                        maxRetries = 0;
                else {
                        try {
-                               maxRetries = Integer.parseInt(maxRetriesString, 
16);
+                               maxRetries = Integer.parseInt(maxRetriesString, 
10);
                        } catch (NumberFormatException e) {
                                throw new 
MessageInvalidException(ProtocolErrorMessage.ERROR_PARSING_NUMBER, "Error 
parsing MaxSize field: "+e.getMessage());
                        }