[freenet-cvs] r7932 - in trunk/freenet/src/freenet: client/async node store

[t...@freenetproject.org]

Author: toad
Date: 2006-01-26 00:18:57 +0000 (Thu, 26 Jan 2006)
New Revision: 7932

Modified:
   trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
383: bugfixes

Modified: trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2006-01-26 00:13:22 UTC (rev 7931)
+++ trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2006-01-26 00:18:57 UTC (rev 7932)
@@ -442,23 +442,32 @@
                switch(e.code) {
                case LowLevelGetException.DATA_NOT_FOUND:
                        onFailure(new 
FetchException(FetchException.DATA_NOT_FOUND));
+                       return;
                case LowLevelGetException.DATA_NOT_FOUND_IN_STORE:
                        onFailure(new 
FetchException(FetchException.DATA_NOT_FOUND));
+                       return;
                case LowLevelGetException.DECODE_FAILED:
                        onFailure(new 
FetchException(FetchException.BLOCK_DECODE_ERROR));
+                       return;
                case LowLevelGetException.INTERNAL_ERROR:
                        onFailure(new 
FetchException(FetchException.INTERNAL_ERROR));
+                       return;
                case LowLevelGetException.REJECTED_OVERLOAD:
                        onFailure(new 
FetchException(FetchException.REJECTED_OVERLOAD));
+                       return;
                case LowLevelGetException.ROUTE_NOT_FOUND:
                        onFailure(new 
FetchException(FetchException.ROUTE_NOT_FOUND));
+                       return;
                case LowLevelGetException.TRANSFER_FAILED:
                        onFailure(new 
FetchException(FetchException.TRANSFER_FAILED));
+                       return;
                case LowLevelGetException.VERIFY_FAILED:
                        onFailure(new 
FetchException(FetchException.BLOCK_DECODE_ERROR));
+                       return;
                default:
                        Logger.error(this, "Unknown LowLevelGetException code: 
"+e.code);
                        onFailure(new 
FetchException(FetchException.INTERNAL_ERROR));
+                       return;
                }
        }


Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-26 00:13:22 UTC (rev 
7931)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-26 00:18:57 UTC (rev 
7932)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-01-26 
00:13:22 UTC (rev 7931)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-01-26 
00:18:57 UTC (rev 7932)
@@ -187,7 +187,7 @@
                    Logger.minor(this, "Data: "+data.length+" bytes, hash 
"+data);

                }catch(CHKVerifyException ex){
-                       Logger.normal(this, "Does not verify, setting 
accessTime to 0 for : "+chk);
+                       Logger.normal(this, "Does not verify ("+ex+"), setting 
accessTime to 0 for : "+chk);
                        storeBlock.setRecentlyUsedToZero();
                        DatabaseEntry updateDBE = new DatabaseEntry();
                        storeBlockTupleBinding.objectToEntry(storeBlock, 
updateDBE);