[freenet-cvs] r7849 - in trunk/freenet/src/freenet: client node

[t...@freenetproject.org]

Author: toad
Date: 2006-01-12 23:15:21 +0000 (Thu, 12 Jan 2006)
New Revision: 7849

Modified:
   trunk/freenet/src/freenet/client/FetchException.java
   trunk/freenet/src/freenet/client/Fetcher.java
   trunk/freenet/src/freenet/node/Version.java
Log:
345: Reporting of client level errors.

Modified: trunk/freenet/src/freenet/client/FetchException.java
===================================================================
--- trunk/freenet/src/freenet/client/FetchException.java        2006-01-12 
22:53:40 UTC (rev 7848)
+++ trunk/freenet/src/freenet/client/FetchException.java        2006-01-12 
23:15:21 UTC (rev 7849)
@@ -95,7 +95,7 @@
                case HAS_MORE_METASTRINGS:
                        return "Not a manifest";
                case BUCKET_ERROR:
-                       return "Internal error, maybe disk full or permissions 
problem?";
+                       return "Internal temp files error, maybe disk full or 
permissions problem?";
                case DATA_NOT_FOUND:
                        return "Data not found";
                case ROUTE_NOT_FOUND:

Modified: trunk/freenet/src/freenet/client/Fetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/Fetcher.java       2006-01-12 22:53:40 UTC 
(rev 7848)
+++ trunk/freenet/src/freenet/client/Fetcher.java       2006-01-12 23:15:21 UTC 
(rev 7849)
@@ -246,8 +246,10 @@
                        FetchResult res = runMetadata(dm, recursionLevel, key, 
metaStrings, metadata, container, thisKey, true, localOnly);
                        try {
                                metadata = Metadata.construct(res.data);
+                       } catch (MetadataParseException e) {
+                               throw new 
FetchException(FetchException.INVALID_METADATA, e);
                        } catch (IOException e) {
-                               throw new 
FetchException(FetchException.BUCKET_ERROR);
+                               throw new 
FetchException(FetchException.BUCKET_ERROR, e);
                        }
                        return runMetadata(dm, recursionLevel, key, 
metaStrings, metadata, container, thisKey, dontEnterImplicitArchives, 
localOnly);
                } else if(metadata.isSingleFileRedirect()) {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-12 22:53:40 UTC (rev 
7848)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-12 23:15:21 UTC (rev 
7849)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 344;
+       public static final int buildNumber = 345;

        /** Oldest build of Fred we will talk to */
        public static final int lastGoodBuild = 344;