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

[t...@freenetproject.org]

Author: toad
Date: 2007-04-14 20:42:26 +0000 (Sat, 14 Apr 2007)
New Revision: 12724

Modified:
   trunk/freenet/src/freenet/node/fcp/ClientPut.java
   trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java
Log:
Better error reporting

Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java   2007-04-14 20:41:36 UTC 
(rev 12723)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java   2007-04-14 20:42:26 UTC 
(rev 12724)
@@ -228,7 +228,7 @@
                        } catch (IOException e) {
                                SHA256.returnMessageDigest(md);
                                Logger.error(this, "Got IOE: " +e.getMessage(), 
e);
-                               throw new 
MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "Got an 
IOException error!", identifier, global);
+                               throw new 
MessageInvalidException(ProtocolErrorMessage.COULD_NOT_READ_FILE, "Unable to 
access file: "+e, identifier, global);
                        }
                        final byte[] foundHash = md.digest();
                        SHA256.returnMessageDigest(md);

Modified: trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java        
2007-04-14 20:41:36 UTC (rev 12723)
+++ trunk/freenet/src/freenet/node/fcp/ProtocolErrorMessage.java        
2007-04-14 20:42:26 UTC (rev 12724)
@@ -47,6 +47,7 @@
        static final int NOT_A_FILE_ERROR = 23;
        static final int ACCESS_DENIED = 24;
        static final int DIRECT_DISK_ACCESS_DENIED = 25;
+       static final int COULD_NOT_READ_FILE = 26;

        final int code;
        final String extra;
@@ -104,6 +105,8 @@
                        return "Filepath is not a file";
                case ACCESS_DENIED:
                        return "Access denied";
+               case COULD_NOT_READ_FILE:
+                       return "Could not read file";
                default:
                        Logger.error(this, "Unknown error code: "+code, new 
Exception("debug"));
                return "(Unknown)";