Author: toad
Date: 2009-01-28 23:59:33 +0000 (Wed, 28 Jan 2009)
New Revision: 25357

Modified:
   branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
Log:
Start segments inline for non-persistent uploads. Fixes wierd NPE.


Modified: branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java       
2009-01-28 17:49:17 UTC (rev 25356)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java       
2009-01-28 23:59:33 UTC (rev 25357)
@@ -289,12 +289,14 @@
        
        public void start(ObjectContainer container, ClientContext context) 
throws InsertException {
                for(int i=0;i<segments.length;i++) {
-                       if(persistent)
+                       if(persistent) {
                                container.activate(segments[i], 1);
                        SplitFileInserterSegmentRegisterJob segJob = new 
SplitFileInserterSegmentRegisterJob(segments[i], NativeThread.NORM_PRIORITY);
                        segJob.schedule(container, context, 
NativeThread.NORM_PRIORITY, persistent);
-                       if(persistent)
                                container.deactivate(segments[i], 1);
+                       } else {
+                               segments[i].start(container, context);
+                       }
                }
                if(persistent)
                        container.activate(parent, 1);

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

Reply via email to