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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-12 23:41:37 +0000 (Sat, 12 Jul 2008)
New Revision: 21129

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Here is better

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-12 23:41:18 UTC (rev 21128)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-12 23:41:37 UTC (rev 21129)
@@ -578,9 +578,9 @@
                                }
                                long startNext = System.currentTimeMillis();
                                RegisterMe reg = (RegisterMe) 
registerMeSet.next();
+                               container.activate(reg, 1);
                                // FIXME remove the leftover/old core handling 
at some point, an NPE is acceptable long-term.
                                if(reg.core != ClientRequestSchedulerCore.this) 
{
-                                       container.activate(reg, 1);
                                        if(reg.core == null) {
                                                Logger.error(this, "Leftover 
RegisterMe: core already deleted. THIS IS AN ERROR unless you have seen \"Old 
core not active\" messages before this point.");
                                                container.delete(reg);