Author: toad
Date: 2009-03-11 20:17:07 +0000 (Wed, 11 Mar 2009)
New Revision: 25999
Modified:
branches/db4o/freenet/src/freenet/client/async/InsertCompressor.java
Log:
Another place we need to check for the request having been killed already on
compression completing.
Modified: branches/db4o/freenet/src/freenet/client/async/InsertCompressor.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/InsertCompressor.java
2009-03-11 20:16:29 UTC (rev 25998)
+++ branches/db4o/freenet/src/freenet/client/async/InsertCompressor.java
2009-03-11 20:17:07 UTC (rev 25999)
@@ -110,6 +110,10 @@
context.jobRunner.queue(new DBJob() {
public void run(ObjectContainer
container, ClientContext context) {
+
if(!container.ext().isStored(inserter)) {
+ if(logMINOR)
Logger.minor(this, "Already deleted (start compression): "+inserter+" for
"+InsertCompressor.this);
+ return;
+ }
if(container.ext().isActive(inserter))
Logger.error(this, "ALREADY ACTIVE in start compression callback: "+inserter);
container.activate(inserter, 1);
@@ -163,6 +167,11 @@
context.jobRunner.queue(new DBJob() {
public void run(ObjectContainer
container, ClientContext context) {
+
if(!container.ext().isStored(inserter)) {
+ if(logMINOR)
Logger.minor(this, "Already deleted: "+inserter+" for "+InsertCompressor.this);
+
container.delete(InsertCompressor.this);
+ return;
+ }
if(container.ext().isActive(inserter))
Logger.error(this,
"ALREADY ACTIVE in compressed callback: "+inserter);
container.activate(inserter, 1);
@@ -203,6 +212,11 @@
context.jobRunner.queue(new DBJob() {
public void run(ObjectContainer
container, ClientContext context) {
+
if(!container.ext().isStored(inserter)) {
+ if(logMINOR)
Logger.minor(this, "Already deleted (on failed): "+inserter+" for
"+InsertCompressor.this);
+
container.delete(InsertCompressor.this);
+ return;
+ }
if(container.ext().isActive(inserter))
Logger.error(this,
"ALREADY ACTIVE in compress failure callback: "+inserter);
container.activate(inserter, 1);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
