Author: toad
Date: 2009-01-22 23:58:52 +0000 (Thu, 22 Jan 2009)
New Revision: 25231
Modified:
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
Log:
Fix another NPE
Modified:
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
2009-01-22 23:56:59 UTC (rev 25230)
+++ branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
2009-01-22 23:58:52 UTC (rev 25231)
@@ -244,7 +244,7 @@
if(persistent)
container.activate(cb, 1);
cb.onFailure(e, this, container, context);
- if(!calledByCB)
+ if(persistent && !calledByCB)
container.deactivate(cb, 1);
return null;
} catch (Throwable t) {
@@ -252,7 +252,7 @@
container.activate(cb, 1);
Logger.error(this, "Caught "+t, t);
cb.onFailure(new
InsertException(InsertException.INTERNAL_ERROR, t, null), this, container,
context);
- if(!calledByCB)
+ if(persistent && !calledByCB)
container.deactivate(cb, 1);
return null;
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
