Author: toad
Date: 2009-01-24 16:21:05 +0000 (Sat, 24 Jan 2009)
New Revision: 25276
Modified:
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
Log:
Activation: Fix NPE in removing an insert
Modified:
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
2009-01-24 16:19:53 UTC (rev 25275)
+++ branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
2009-01-24 16:21:05 UTC (rev 25276)
@@ -345,9 +345,12 @@
if(finished) return;
finished = true;
}
+ boolean wasActive = true;
if(persistent) {
container.store(this);
- container.activate(cb, 1);
+ wasActive = container.ext().isActive(cb);
+ if(!wasActive)
+ container.activate(cb, 1);
container.activate(sourceData, 1);
}
if(freeData) {
@@ -356,7 +359,7 @@
}
super.unregister(container, context);
cb.onFailure(new InsertException(InsertException.CANCELLED),
this, container, context);
- if(persistent)
+ if(!wasActive)
container.deactivate(cb, 1);
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
