Author: toad
Date: 2009-03-27 13:34:01 +0000 (Fri, 27 Mar 2009)
New Revision: 26227

Modified:
   branches/db4o/freenet/src/freenet/client/async/USKInserter.java
Log:
Logging, fix NPE


Modified: branches/db4o/freenet/src/freenet/client/async/USKInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/USKInserter.java     
2009-03-27 11:33:01 UTC (rev 26226)
+++ branches/db4o/freenet/src/freenet/client/async/USKInserter.java     
2009-03-27 13:34:01 UTC (rev 26227)
@@ -82,6 +82,8 @@
                                Logger.minor(this, "scheduling fetcher for 
"+pubUSK.getURI());
                        if(finished) return;
                        fetcher = 
context.uskManager.getFetcherForInsertDontSchedule(persistent ? pubUSK.clone() 
: pubUSK, parent.priorityClass, this, parent.getClient(), container, context, 
persistent);
+                       if(Logger.shouldLog(Logger.MINOR, this))
+                               Logger.minor(this, "scheduled: "+fetcher);
                }
                if(persistent) {
                        container.store(fetcher);
@@ -188,7 +190,7 @@
                if(freeData) {
                        if(persistent) container.activate(data, 1);
                        data.free();
-                       data.removeFrom(container);
+                       if(persistent) data.removeFrom(container);
                        synchronized(this) {
                                data = null;
                        }

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to