[freenet-cvs] r9466 - in trunk/freenet/src/freenet: node store

[t...@freenetproject.org]

Author: toad
Date: 2006-07-05 00:41:17 +0000 (Wed, 05 Jul 2006)
New Revision: 9466

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
859: Datastore fix, logging.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-07-04 12:14:41 UTC (rev 
9465)
+++ trunk/freenet/src/freenet/node/Node.java    2006-07-05 00:41:17 UTC (rev 
9466)
@@ -25,7 +25,6 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.TreeMap;
 import java.util.Vector;
 import java.util.zip.DeflaterOutputStream;


Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-07-04 12:14:41 UTC (rev 
9465)
+++ trunk/freenet/src/freenet/node/Version.java 2006-07-05 00:41:17 UTC (rev 
9466)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 858;
+       private static final int buildNumber = 859;

        /** Oldest build of Fred we will talk to */
        private static final int oldLastGoodBuild = 839;

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-07-04 
12:14:41 UTC (rev 9465)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-07-05 
00:41:17 UTC (rev 9466)
@@ -510,7 +510,6 @@
                                Long l = new Long(storeBlock.offset);
                                if(s.contains(l)) {
                                        Logger.minor(this, "Deleting (block 
number conflict).");
-                                       addFreeBlock(storeBlock.offset);
                                        chkDB.delete(t, keyDBE);
                                }
                                s.add(l);
@@ -846,6 +845,7 @@

     private void addFreeBlock(long offset) {
                if(freeBlocks.push(offset)) {
+                       System.err.println("Freed block "+offset);
                        Logger.normal(this, "Freed block "+offset);
                } else {
                        Logger.minor(this, "Already freed block "+offset);
@@ -1226,6 +1226,7 @@

     private class ShutdownHook extends Thread {
        public void run() {
+               System.err.println("Closing database due to shutdown.");
                close();
        }
     }