[freenet-cvs] r18817 - trunk/freenet/src/freenet/store

[t...@freenetproject.org]

Author: toad
Date: 2008-03-28 22:33:31 +0000 (Fri, 28 Mar 2008)
New Revision: 18817

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
catch KeyVerifyException, *not* SSKVerifyException

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-03-28 
22:19:36 UTC (rev 18816)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-03-28 
22:33:31 UTC (rev 18817)
@@ -4,6 +4,7 @@
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.RandomAccessFile;
@@ -36,7 +37,6 @@

 import freenet.crypt.RandomSource;
 import freenet.keys.KeyVerifyException;
-import freenet.keys.SSKVerifyException;
 import freenet.node.SemiOrderedShutdownHook;
 import freenet.support.Fields;
 import freenet.support.HexUtil;
@@ -1311,14 +1311,14 @@
                                        Logger.minor(this, "Data: " + 
data.length + " bytes, hash " + Fields.hashCode(data) + " fetching " + 
HexUtil.bytesToHex(routingkey));
                                }

-                       } catch(SSKVerifyException ex) {
-                               Logger.normal(this, "SSKBlock: Does not verify 
("+ex+"), setting accessTime to 0 for : "+HexUtil.bytesToHex(routingkey), ex);
+                       } catch(KeyVerifyException ex) {
+                               Logger.normal(this, "Does not verify ("+ex+"), 
setting accessTime to 0 for : "+HexUtil.bytesToHex(routingkey), ex);
                                keysDB.delete(t, routingkeyDBE);
                                c.close();
                                c = null;
                                t.commit();
                                t = null;
-                               addFreeBlock(storeBlock.offset, true, "SSK does 
not verify");
+                               addFreeBlock(storeBlock.offset, true, "Key does 
not verify");
                                synchronized(this) {
                                        misses++;
                                }