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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-12 02:50:24 +0000 (Sat, 12 Jul 2008)
New Revision: 21095

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Prevent NPE. No, this isn't the bug I just worked around.

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-12 02:48:03 UTC (rev 21094)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-12 02:50:24 UTC (rev 21095)
@@ -127,6 +127,7 @@
                InsertCompressor.load(container, context);
                this.initTime = System.currentTimeMillis();
                // We DO NOT want to rerun the query after consuming the 
initial set...
+               if(!this.isInsertScheduler) {
                preRegisterMeRunner = new DBJob() {

                        public void run(ObjectContainer container, 
ClientContext context) {
@@ -180,6 +181,9 @@

                };
                registerMeRunner = new RegisterMeRunner();
+               } else {
+                       registerMeRunner = null;
+               }

        }