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

[t...@freenetproject.org]

Author: toad
Date: 2008-01-05 22:54:36 +0000 (Sat, 05 Jan 2008)
New Revision: 16935

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-01-05 
22:47:02 UTC (rev 16934)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-01-05 
22:54:36 UTC (rev 16935)
@@ -1123,6 +1123,7 @@
                long l = 0;
                long dupes = 0;
                long failures = 0;
+               long expectedLength = 
storeRAF.length()/(dataBlockSize+headerBlockSize);
                try {
                        storeRAF.seek(0);
                        lruRAF.seek(0);
@@ -1191,7 +1192,7 @@
                                        }
                                        t.commit();
                                        if(l % 1024 == 0)
-                                               System.out.println("Key "+l+ 
'/' +(storeRAF.length()/(dataBlockSize+headerBlockSize))+" OK ("+dupes+" dupes, 
"+failures+" failures)");
+                                               System.out.println("Key "+l+ 
'/' +expectedLength+" OK ("+dupes+" dupes, "+failures+" failures)");
                                        t = null;
                                } catch (DatabaseException e) {
                                        // t.abort() below may also throw.
@@ -1203,8 +1204,12 @@
                        }
                } catch (EOFException e) {
                        long size = l * (dataBlockSize + headerBlockSize);
-                       System.err.println("Found end of store, truncating to 
"+l+" blocks : "+size+" ("+failures+" failures "+dupes+" dupes)");
-                       e.printStackTrace();
+                       if(l < expectedLength) {
+                               System.err.println("Found end of store, 
truncating to "+l+" blocks : "+size+" ("+failures+" failures "+dupes+" dupes)");
+                               e.printStackTrace();
+                       } else {
+                               System.err.println("Confirmed store is 
"+expectedLength+" blocks long");
+                       }
                        blocksInStore = l;
                        try {
                                storeRAF.setLength(size);