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

[t...@freenetproject.org]

Author: toad
Date: 2008-01-04 22:52:09 +0000 (Fri, 04 Jan 2008)
New Revision: 16895

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
DOH! Fix keys-files-are-always-zero-bytes.

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-01-04 
22:42:43 UTC (rev 16894)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-01-04 
22:52:09 UTC (rev 16895)
@@ -447,7 +447,7 @@
                                if(!keysFile.exists())
                                        if(!keysFile.createNewFile())
                                                throw new 
DatabaseException("can't create a new file "+keysFile+" !");
-                               keysRAF = new RandomAccessFile(lruFile,"rw");
+                               keysRAF = new RandomAccessFile(keysFile,"rw");
                        } else keysRAF = null;

                        boolean dontCheckForHolesShrinking = false;
@@ -1093,7 +1093,7 @@
                        if(!keysFile.exists())
                                if(!keysFile.createNewFile())
                                        throw new DatabaseException("can't 
create a new file "+keysFile+" !");
-                       keysRAF = new RandomAccessFile(lruFile,"rw");
+                       keysRAF = new RandomAccessFile(keysFile,"rw");
                } else
                        keysRAF = null;

@@ -1960,6 +1960,10 @@
                        if(keysRAF != null) {
                                keysRAF.seek(blockNum * keyLength);
                                keysRAF.write(fullKey);
+                               if(logMINOR)
+                                       Logger.minor(this, "Written full key 
length "+fullKey.length+" to block "+blockNum+" at "+(blockNum * keyLength));
+                       } else if(logMINOR && storeType == TYPE_SSK) {
+                               Logger.minor(this, "Not writing full key length 
"+fullKey.length+" for block "+blockNum);
                        }
                        writes++;
                }