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

[t...@freenetproject.org]

Author: toad
Date: 2008-01-04 15:26:37 +0000 (Fri, 04 Jan 2008)
New Revision: 16882

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
Only create keysFile for SSK stores.

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-01-04 
15:24:40 UTC (rev 16881)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-01-04 
15:26:37 UTC (rev 16882)
@@ -131,7 +131,9 @@
                String newStoreFileName = typeName(type) + suffix + '.' + 
(isStore ? "store" : "cache");
                File newStoreFile = new File(baseStoreDir, newStoreFileName);
                File lruFile = new File(baseStoreDir, newStoreFileName+".lru");
-               File keysFile = new File(baseStoreDir, 
newStoreFileName+".keys");
+               File keysFile = null;
+               if(type == TYPE_SSK)
+                       keysFile = new File(baseStoreDir, 
newStoreFileName+".keys");

                String newDBPrefix = typeName(type)+ '-' +(isStore ? "store" : 
"cache")+ '-';

@@ -431,10 +433,12 @@
                                        throw new DatabaseException("can't 
create a new file "+lruFile+" !");
                        lruRAF = new RandomAccessFile(lruFile,"rw");

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

                        boolean dontCheckForHolesShrinking = false;

@@ -1039,10 +1043,13 @@
                                throw new DatabaseException("can't create a new 
file "+lruFile+" !");
                lruRAF = new RandomAccessFile(lruFile,"rw");

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

                blocksInStore = 0;