Author: toad
Date: 2009-01-24 19:50:31 +0000 (Sat, 24 Jan 2009)
New Revision: 25289
Modified:
branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java
branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
Log:
Maybe fix NPE/activation issue. Paranoia.
Modified: branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java
2009-01-24 18:49:40 UTC (rev 25288)
+++ branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java
2009-01-24 19:50:31 UTC (rev 25289)
@@ -231,7 +231,10 @@
}
public void removeFrom(ObjectContainer container) {
- key.removeFrom(container);
+ if(key == null) {
+ Logger.error(this, "removeFrom() : key = null for
"+this+" I exist = "+container.ext().isStored(this)+" I am active:
"+container.ext().isActive(this), new Exception("error"));
+ } else
+ key.removeFrom(container);
container.delete(this);
}
Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
2009-01-24 18:49:40 UTC (rev 25288)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
2009-01-24 19:50:31 UTC (rev 25289)
@@ -1135,8 +1135,10 @@
uri.removeFrom(container);
if(thisKey != null)
thisKey.removeFrom(container);
- if(ah != null)
+ if(ah != null) {
+ ah.activateForExecution(container);
ah.removeFrom(container);
+ }
metaStrings.clear();
container.delete(metaStrings);
clientMetadata.removeFrom(container);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
