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

[t...@freenetproject.org]

Author: toad
Date: 2008-08-20 18:52:47 +0000 (Wed, 20 Aug 2008)
New Revision: 22063

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Fix NPE on restart


Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java  
    2008-08-20 18:50:33 UTC (rev 22062)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java  
    2008-08-20 18:52:47 UTC (rev 22063)
@@ -60,7 +60,7 @@
        protected final List /* <BaseSendableGet> */ recentSuccesses;
        protected transient ClientRequestScheduler sched;
        /** Transient even for persistent scheduler. */
-       protected transient final Set<KeyListener> keyListeners;
+       protected transient Set<KeyListener> keyListeners;

        abstract boolean persistent();

@@ -323,4 +323,8 @@

        protected abstract Set 
makeSetForAllRequestsByClientRequest(ObjectContainer container);

+       public void onStarted() {
+               keyListeners = new HashSet<KeyListener>();
+       }
+
 }

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-08-20 18:50:33 UTC (rev 22062)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-08-20 18:52:47 UTC (rev 22063)
@@ -114,6 +114,7 @@
        }

        private void onStarted(ObjectContainer container, long cooldownTime, 
ClientRequestScheduler sched, ClientContext context) {
+               super.onStarted();
                System.err.println("insert scheduler: "+isInsertScheduler);
                if(allRequestsByClientRequest == null)
                        System.err.println("allRequestsByClientRequest is 
null");