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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-12 12:55:46 +0000 (Sat, 12 Jul 2008)
New Revision: 21100

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Convert constant NPE into single log message

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-12 06:36:10 UTC (rev 21099)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-12 12:55:46 UTC (rev 21100)
@@ -182,6 +182,7 @@
                };
                registerMeRunner = new RegisterMeRunner();
                } else {
+                       preRegisterMeRunner = null;
                        registerMeRunner = null;
                }

@@ -553,6 +554,10 @@

                public void run(ObjectContainer container, ClientContext 
context) {
                        long deadline = System.currentTimeMillis() + 10*1000;
+                       if(registerMeSet == null) {
+                               Logger.error(this, "registerMeSet is null for 
"+ClientRequestSchedulerCore.this+" ( "+this+" )");
+                               return;
+                       }
                        for(int i=0;i < 10; i++) {
                                try {
                                        if(!registerMeSet.hasNext()) break;