Author: toad
Date: 2009-03-26 13:01:48 +0000 (Thu, 26 Mar 2009)
New Revision: 26195
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
Fix NPE, logging
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2009-03-26 00:02:05 UTC (rev 26194)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2009-03-26 13:01:48 UTC (rev 26195)
@@ -457,6 +457,7 @@
}
public void removeFrom(ObjectContainer container, ClientContext
context) {
+ if(logMINOR) Logger.minor(this, "Removing "+this);
SingleFileInserter oldSFI;
ClientPutState oldState;
synchronized(this) {
@@ -1532,7 +1533,7 @@
Logger.error(this, "Put handlers list still present in
removeFrom() on "+this);
removePutHandlers(container, context);
}
- finalURI.removeFrom(container);
+ if(finalURI != null) finalURI.removeFrom(container);
targetURI.removeFrom(container);
container.activate(ctx, 1);
ctx.removeFrom(container);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
