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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-03-17 14:10:24 +0000 (Sat, 17 Mar 2007)
New Revision: 12182

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
   trunk/freenet/src/freenet/store/Store.java
Log:
Check the return value of createNewFile() - we'd better be paranoid there.

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-03-17 
14:06:42 UTC (rev 12181)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-03-17 
14:10:24 UTC (rev 12182)
@@ -529,7 +529,8 @@
                // Initialize the store file
                try {
                        if(!storeFile.exists())
-                               storeFile.createNewFile();
+                               if(!storeFile.createNewFile())
+                                       throw new DatabaseException("can't 
create a new file !");
                        chkStore = new RandomAccessFile(storeFile,"rw");

                        boolean dontCheckForHolesShrinking = false;
@@ -1124,7 +1125,8 @@

                // Initialize the store file
                if(!storeFile.exists())
-                       storeFile.createNewFile();
+                       if(!storeFile.createNewFile())
+                               throw new DatabaseException("can't create a new 
file !");
                chkStore = new RandomAccessFile(storeFile,"rw");

                chkBlocksInStore = 0;

Modified: trunk/freenet/src/freenet/store/Store.java
===================================================================
--- trunk/freenet/src/freenet/store/Store.java  2007-03-17 14:06:42 UTC (rev 
12181)
+++ trunk/freenet/src/freenet/store/Store.java  2007-03-17 14:10:24 UTC (rev 
12182)
@@ -22,6 +22,8 @@
 import java.io.*;
 import java.util.*;

+import com.sleepycat.je.DatabaseException;
+
 import freenet.keys.Key;

 public abstract class Store {
@@ -43,7 +45,8 @@

        protected Store(File blockStoreFile, long maxBlocks) throws Exception {
                if (!blockStoreFile.exists()) {
-                       blockStoreFile.createNewFile();
+                       if(!blockStoreFile.createNewFile())
+                               throw new DatabaseException("can't create a new 
file !");
                }
                _blockStore = new RandomAccessFile(blockStoreFile, "rw");
                _maxBlocks = maxBlocks;