Author: toad
Date: 2008-07-11 15:00:59 +0000 (Fri, 11 Jul 2008)
New Revision: 21064

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Delete the RegisterMe only after we're done with it.

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-11 14:58:12 UTC (rev 21063)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-11 15:00:59 UTC (rev 21064)
@@ -535,7 +535,6 @@
                                long endNext = System.currentTimeMillis();
                                if(logMINOR)
                                        Logger.minor(this, "RegisterMe: next() 
took "+(endNext-startNext));
-                               container.delete(reg);
                                if(reg.getters != null) {
                                        boolean allKilled = true;
                                        for(int j=0;j<reg.getters.length;j++) {
@@ -553,7 +552,7 @@
                                        Logger.minor(this, "Running RegisterMe 
"+reg+" for "+reg.listener+" and "+reg.getters+" : "+reg.key.addedTime+" : 
"+reg.key.priority);
                                // Don't need to activate, fields should exist? 
FIXME
                                try {
-                                       sched.register(reg.listener, 
reg.getters, false, true, true, reg.blocks, null);
+                                       sched.register(reg.listener, 
reg.getters, false, true, true, reg.blocks, reg);
                                } catch (Throwable t) {
                                        Logger.error(this, "Caught "+t+" 
running RegisterMeRunner", t);
                                        // Cancel the request, and commit so it 
isn't tried again.


Reply via email to