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

[t...@freenetproject.org]

Author: toad
Date: 2007-04-18 19:05:29 +0000 (Wed, 18 Apr 2007)
New Revision: 12789

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
removeDatabase not truncateDatabase

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-04-18 
19:03:42 UTC (rev 12788)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-04-18 
19:05:29 UTC (rev 12789)
@@ -464,12 +464,12 @@
                        // NB: it might be a wrapper-version-missmatch problem 
(nextgens)
                        try {
                                try {
-                                       environment.truncateDatabase(null, 
prefix+"CHK_accessTime", false);
+                                       environment.removeDatabase(null, 
prefix+"CHK_accessTime");
                                } catch (DatabaseNotFoundException e) {
                                        // Cool!
                                }
                                try {
-                                       environment.truncateDatabase(null, 
prefix+"CHK_blockNum", false);
+                                       environment.removeDatabase(null, 
prefix+"CHK_blockNum");
                                } catch (DatabaseNotFoundException e) {
                                        // Cool!
                                }
@@ -512,7 +512,7 @@
                        System.err.println("Reconstructing access times 
index...");
                        Logger.error(this, "Reconstructing access times 
index...");
                        if(atime != null) atime.close();
-                       environment.truncateDatabase(null, 
prefix+"CHK_accessTime", false);
+                       environment.removeDatabase(null, 
prefix+"CHK_accessTime");
                        secDbConfig.setAllowCreate(true);
                        secDbConfig.setAllowPopulate(true);
                        atime = environment.openSecondaryDatabase
@@ -563,7 +563,7 @@
                        // it won't overflow ... or we debug the wrapper.
                        // NB: it might be a wrapper-version-missmatch problem 
(nextgens)
                        if(blockNums != null) blockNums.close();
-                       environment.truncateDatabase(null, 
prefix+"CHK_blockNum", false);
+                       environment.removeDatabase(null, prefix+"CHK_blockNum");
                        System.err.println("Reconstructing block numbers 
index...");
                        Logger.error(this, "Reconstructing block numbers 
index...");
                        System.err.println("Creating new block DB index");