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

[t...@freenetproject.org]

Author: toad
Date: 2008-08-29 00:10:43 +0000 (Fri, 29 Aug 2008)
New Revision: 22212

Modified:
   branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
   branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
Call onDumped()


Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-08-29 00:08:22 UTC (rev 22211)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-08-29 00:10:43 UTC (rev 22212)
@@ -566,15 +566,20 @@
                }
        }

-       void removeFromStarterQueue(SendableRequest req) {
+       void removeFromStarterQueue(SendableRequest req, ObjectContainer 
container) {
+               PersistentChosenRequest dumped = null;
                synchronized(starterQueue) {
                        for(int i=0;i<starterQueue.size();i++) {
-                               if(starterQueue.get(i).request == req) {
+                               PersistentChosenRequest pcr = 
starterQueue.get(i);
+                               if(pcr.request == req) {
                                        starterQueue.remove(i);
-                                       i--;
+                                       dumped = pcr;
+                                       break;
                                }
                        }
                }
+               if(dumped != null)
+                       dumped.onDumped(schedCore, container);
        }

        int starterQueueSize() {

Modified: 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-08-29 00:08:22 UTC (rev 22211)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-08-29 00:10:43 UTC (rev 22212)
@@ -870,7 +870,7 @@
                        if(persistent)
                                container.activate(deadSegs[i], 1);
                        deadSegs[i].kill(container, context, true);
-                       
context.getChkFetchScheduler().removeFromStarterQueue(deadSegs[i]);
+                       
context.getChkFetchScheduler().removeFromStarterQueue(deadSegs[i], container);
                        if(persistent)
                                container.deactivate(deadSegs[i], 1);
                }