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

[t...@freenetproject.org]

Author: toad
Date: 2008-05-16 17:16:10 +0000 (Fri, 16 May 2008)
New Revision: 19956

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
Logging.

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-05-16 
15:15:44 UTC (rev 19955)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-05-16 
17:16:10 UTC (rev 19956)
@@ -943,10 +943,11 @@
        private void reconstruct() throws DatabaseException, IOException {
                if(keysDB.count() != 0)
                        throw new IllegalStateException("Store must be empty 
before reconstruction!");
-               System.err.println("Reconstructing store index from store file: 
callback="+callback);
+               int timeout = (int) (Math.min(Integer.MAX_VALUE, 5 * 60 * 1000
+                       + (storeRAF.length() / (dataBlockSize + 
headerBlockSize)) * 1000L));
+               System.err.println("Reconstructing store index from store file: 
callback="+callback+" - allowing "+timeout+"ms");
                Logger.error(this, "Reconstructing store index from store file: 
callback="+callback);
-               WrapperManager.signalStarting((int) 
(Math.min(Integer.MAX_VALUE, 5 * 60 * 1000
-                       + (storeRAF.length() / (dataBlockSize + 
headerBlockSize)) * 1000L)));
+               WrapperManager.signalStarting(timeout);
                // Reusing the buffer is safe, provided we don't do anything 
with the resulting StoreBlock.
                byte[] header = new byte[headerBlockSize];
                byte[] data = new byte[dataBlockSize];