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

[t...@freenetproject.org]

Author: toad
Date: 2008-01-05 19:46:32 +0000 (Sat, 05 Jan 2008)
New Revision: 16914

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
Actually do the SSK reconstruction

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-01-05 
19:46:08 UTC (rev 16913)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-01-05 
19:46:32 UTC (rev 16914)
@@ -1145,12 +1145,6 @@
        private void reconstruct(short type) throws DatabaseException, 
IOException {
                if(keysDB.count() != 0)
                        throw new IllegalStateException("Store must be empty 
before reconstruction!");
-               if(type == TYPE_SSK) {
-                       System.err.println("Reconstruction of SSK store not 
supported at present.");
-                       throw new UnsupportedOperationException("Reconstruction 
of SSK store not supported at present.");
-                       // FIXME we would need to pass in a means to fetch the 
pubkeys (an already-working BDBFS maybe).
-                       // This could be via an interface. It might be 
implemented by the node so we can use the in-RAM cache.
-               }
                System.err.println("Reconstructing store index from store file: 
type="+type);
                Logger.error(this, "Reconstructing store index from store file: 
type="+type);
                WrapperManager.signalStarting((int)(Math.min(Integer.MAX_VALUE, 
5*60*1000+(storeRAF.length()/(dataBlockSize+headerBlockSize))*100)));