Author: toad
Date: 2009-02-25 22:58:58 +0000 (Wed, 25 Feb 2009)
New Revision: 25824
Modified:
branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
Log:
Activate before removal, fix NPE
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
2009-02-25 22:56:59 UTC (rev 25823)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
2009-02-25 22:58:58 UTC (rev 25824)
@@ -212,8 +212,10 @@
pfm.removeFrom(container);
if(uri != null)
uri.removeFrom(container);
- if(progress != null)
+ if(progress != null) {
+ container.activate(progress, 1);
progress.removeFrom(container);
+ }
publicURI.removeFrom(container);
}
}
@@ -321,8 +323,10 @@
progressMessage = msg;
}
}
- if(oldProgress != null)
+ if(oldProgress != null) {
+ container.activate(oldProgress, 1);
oldProgress.removeFrom(container);
+ }
container.store(this);
} else {
final FCPConnectionOutputHandler h = handler;
@@ -518,8 +522,14 @@
this.progressMessage = null;
started = false;
}
- pfm.removeFrom(container);
- progress.removeFrom(container);
+ if(pfm != null) {
+ container.activate(pfm, 1);
+ pfm.removeFrom(container);
+ }
+ if(progress != null) {
+ container.activate(progress, 1);
+ progress.removeFrom(container);
+ }
if(persistenceType == PERSIST_FOREVER)
container.store(this);
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
