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

[t...@freenetproject.org]

Author: toad
Date: 2008-05-02 23:25:02 +0000 (Fri, 02 May 2008)
New Revision: 19689

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
Don't abort twice

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-05-02 
17:32:59 UTC (rev 19688)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-05-02 
23:25:02 UTC (rev 19689)
@@ -1509,6 +1509,7 @@
                                // Key already exists!
                                // But is it valid?
                                t.abort();
+                               t = null;
                                if(fetch(routingkey, fullKey, false) != null) 
return; // old key was valid, we are not overwriting
                                // If we are here, it was corrupt, or it was 
just deleted, so we can replace it.
                                if(logMINOR) Logger.minor(this, "Old key was 
invalid, adding anyway");