Author: toad
Date: 2009-04-01 00:20:09 +0000 (Wed, 01 Apr 2009)
New Revision: 26294

Modified:
   branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
Log:
Succeed anyway even if not disk-based


Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java   2009-04-01 
00:19:48 UTC (rev 26293)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java   2009-04-01 
00:20:09 UTC (rev 26294)
@@ -377,10 +377,10 @@
                                }
                        }
                        if(failed && persistenceType == PERSIST_FOREVER) {
-                               if(container.ext().getID(returnBucket) == 
container.ext().getID(data))
+                               if(container.ext().getID(returnBucket) == 
container.ext().getID(data)) {
                                        Logger.error(this, "DB4O BUG DETECTED 
WITHOUT ARRAY HANDLING! EVIL HORRIBLE BUG! 
UID(returnBucket)="+container.ext().getID(returnBucket)+" for "+returnBucket+" 
active="+container.ext().isActive(returnBucket)+" stored = 
"+container.ext().isStored(returnBucket)+" but 
UID(data)="+container.ext().getID(data)+" for "+data+" active = 
"+container.ext().isActive(data)+" stored = "+container.ext().isStored(data));
-                               if(returnType == 
ClientGetMessage.RETURN_TYPE_DISK) {
-                                       Logger.error(this, "Succeeding anyway 
as the data should be on disk...");
+                                       // Succeed anyway, hope that the 
returned bucket is consistent...
+                                       returnBucket = data;
                                        failed = false;
                                }
                        }

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to