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

[t...@freenetproject.org]

Author: toad
Date: 2006-11-13 21:31:24 +0000 (Mon, 13 Nov 2006)
New Revision: 10913

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
Don't write the block twice.

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-11-13 
21:24:13 UTC (rev 10912)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-11-13 
21:31:24 UTC (rev 10913)
@@ -1555,21 +1555,6 @@

                writeBlock(header, data, t, routingkeyDBE);

-               long blockNum;
-               if((blockNum = grabFreeBlock()) >= 0) {
-                       writeNewBlock(blockNum, header, data, t, routingkeyDBE);
-               } else if(chkBlocksInStore<maxChkBlocks) {
-                       // Expand the store file
-                       synchronized(chkBlocksInStoreLock) {
-                               blockNum = chkBlocksInStore;
-                               chkBlocksInStore++;
-                       }
-                       // Just in case
-                       freeBlocks.remove(blockNum);
-                       writeNewBlock(blockNum, header, data, t, routingkeyDBE);
-               }else{
-                       overwriteLRUBlock(header, data, t, routingkeyDBE);
-               }
                t.commit();
                t = null;