[freenet-cvs] r23067 - branches/db4o/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-10-24 11:13:28 +0000 (Fri, 24 Oct 2008)
New Revision: 23067

Modified:
   branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
   
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegmentRegisterJob.java
Log:
Fix NPE


Modified: branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java       
2008-10-23 23:48:32 UTC (rev 23066)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java       
2008-10-24 11:13:28 UTC (rev 23067)
@@ -274,7 +274,7 @@
                        if(persistent)
                                container.activate(segments[i], 1);
                        SplitFileInserterSegmentRegisterJob segJob = new 
SplitFileInserterSegmentRegisterJob(segments[i], NativeThread.NORM_PRIORITY);
-                       segJob.schedule(container, context, 
NativeThread.NORM_PRIORITY);
+                       segJob.schedule(container, context, 
NativeThread.NORM_PRIORITY, persistent);
                        if(persistent)
                                container.deactivate(segments[i], 1);
                }

Modified: 
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegmentRegisterJob.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegmentRegisterJob.java
     2008-10-23 23:48:32 UTC (rev 23066)
+++ 
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegmentRegisterJob.java
     2008-10-24 11:13:28 UTC (rev 23067)
@@ -29,8 +29,9 @@
                container.delete(this);
        }

-       public void schedule(ObjectContainer container, ClientContext context, 
int nowPriority) {
-               context.jobRunner.queueRestartJob(this, restartPriority, 
container);
+       public void schedule(ObjectContainer container, ClientContext context, 
int nowPriority, boolean persistent) {
+               if(persistent)
+                       context.jobRunner.queueRestartJob(this, 
restartPriority, container);
                context.jobRunner.queue(this, nowPriority, false);
        }