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

[t...@freenetproject.org]

Author: toad
Date: 2008-04-15 11:42:00 +0000 (Tue, 15 Apr 2008)
New Revision: 19347

Modified:
   trunk/freenet/src/freenet/store/RAMFreenetStore.java
Log:
Revert the controversial part of 19306. Sorry sdiz, but I need to release 1140. 
Feel free to reinstate it after 1140 is released: I still don't understand it, 
but we can argue about it. :)

Modified: trunk/freenet/src/freenet/store/RAMFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/RAMFreenetStore.java        2008-04-15 
07:07:44 UTC (rev 19346)
+++ trunk/freenet/src/freenet/store/RAMFreenetStore.java        2008-04-15 
11:42:00 UTC (rev 19347)
@@ -81,6 +81,10 @@
                boolean storeFullKeys = callback.storeFullKeys();
                if(oldBlock != null) {
                        if(callback.collisionPossible()) {
+                               boolean equals = Arrays.equals(oldBlock.data, 
data) &&
+                                       Arrays.equals(oldBlock.header, header) 
&&
+                                       (storeFullKeys ? 
Arrays.equals(oldBlock.fullKey, fullKey) : true);
+                               if(equals) return;
                                if(overwrite) {
                                        oldBlock.data = data;
                                        oldBlock.header = header;