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

[t...@freenetproject.org]

Author: toad
Date: 2006-08-05 18:27:25 +0000 (Sat, 05 Aug 2006)
New Revision: 9909

Modified:
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
   trunk/freenet/src/freenet/support/SortedLongSet.java
Log:
932: Another datastore fix.

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-08-05 18:12:27 UTC (rev 
9908)
+++ trunk/freenet/src/freenet/node/Version.java 2006-08-05 18:27:25 UTC (rev 
9909)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

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

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

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-08-05 
18:12:27 UTC (rev 9908)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-08-05 
18:27:25 UTC (rev 9909)
@@ -380,7 +380,7 @@
                        System.err.println("Keys to move but no keys to move 
over! Moved "+i);
                        t.commit();
                        t = null;
-                       break;
+                       return;
                }
                Integer unwantedBlock = unwantedMoveNums[i];
                // Delete unwantedBlock from the store
@@ -419,6 +419,9 @@
                if(t != null)
                        t.abort();
        }
+               freeBlocks.clear();
+               for(int i=wantedMoveNums.length;i<unwantedMoveNums.length;i++)
+                       addFreeBlock(unwantedMoveNums[i].longValue());
        maybeQuickShrink(false);

        }

Modified: trunk/freenet/src/freenet/support/SortedLongSet.java
===================================================================
--- trunk/freenet/src/freenet/support/SortedLongSet.java        2006-08-05 
18:12:27 UTC (rev 9908)
+++ trunk/freenet/src/freenet/support/SortedLongSet.java        2006-08-05 
18:27:25 UTC (rev 9909)
@@ -112,4 +112,11 @@
                return val;
        }

+       public void clear() {
+               data = new long[MIN_SIZE];
+               for(int i=0;i<data.length;i++)
+                       data[i] = Long.MAX_VALUE;
+               length = 0;
+       }
+
 }