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

[t...@freenetproject.org]

Author: toad
Date: 2008-01-05 22:17:52 +0000 (Sat, 05 Jan 2008)
New Revision: 16931

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
brackets in wrong places - we weren't writing any new blocks!

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-01-05 
22:12:18 UTC (rev 16930)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-01-05 
22:17:52 UTC (rev 16931)
@@ -1233,7 +1233,7 @@
                        * take the write lock. Neither can relinquish the read 
in order for the other to
                        * take the write, so we're screwed.
                        */
-                       if(logMINOR) Logger.minor(this, "Fetching 
"+HexUtil.bytesToHex(routingkey)+" dontPromote="+dontPromote);
+                       if(logMINOR) Logger.minor(this, "Fetching 
"+HexUtil.bytesToHex(routingkey)+" dontPromote="+dontPromote+" for "+callback);
                        if(c.getSearchKey(routingkeyDBE,blockDBE,LockMode.RMW)
                                        !=OperationStatus.SUCCESS) {
                                c.close();
@@ -1351,12 +1351,11 @@
                        if(!block.equals(oldBlock)) {
                                if(!overwrite)
                                        throw new KeyCollisionException();
-                               else {
+                               else
                                        overwrite(block, routingkey, fullKey, 
data, header);
-                               }
-                       } else {
-                               innerPut(block, routingkey, fullKey, data, 
header);
-                       }
+                       } // else return; // already in store
+               } else {
+                       innerPut(block, routingkey, fullKey, data, header);
                }
        }