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

[t...@freenetproject.org]

Author: toad
Date: 2008-04-30 17:17:00 +0000 (Wed, 30 Apr 2008)
New Revision: 19631

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
More refactoring

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-04-30 
17:06:14 UTC (rev 19630)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-04-30 
17:17:00 UTC (rev 19631)
@@ -1060,17 +1060,7 @@
                                                Logger.error(this, "Duplicate 
block: "+l+" key null = "+isAllNull(keyBuf)+" routing key null = 
"+isAllNull(routingkey)+" headers null = "+isAllNull(header)+" data null = 
"+isAllNull(data));
                                                System.err.println("Duplicate 
block: "+l+" key null = "+isAllNull(keyBuf)+" routing key null = 
"+isAllNull(routingkey)+" headers null = "+isAllNull(header)+" data null = 
"+isAllNull(data));
                                                dupes++;
-                                               storeBlock = new StoreBlock(l, 
--minLRU);
-                                               byte[] buf = new byte[32];
-                                               random.nextBytes(buf);
-                                               routingkeyDBE = new 
DatabaseEntry(buf);
-                                               blockDBE = new DatabaseEntry();
-                                               
storeBlockTupleBinding.objectToEntry(storeBlock, blockDBE);
-                                               op = 
keysDB.putNoOverwrite(t,routingkeyDBE,blockDBE);
-                                               if(op != 
OperationStatus.SUCCESS) {
-                                                       Logger.error(this, 
"Impossible operation status inserting bogus key to LRU: "+op);
-                                                       addFreeBlock(l, true, 
"Impossible to add (dupe) to LRU: "+op);
-                                               }
+                                               reconstructAddFreeBlock(l, t, 
--minLRU);
                                                t.commitNoSync();
                                                t = null;
                                                continue;