[freenet-cvs] r22837 - in branches/db4o/freenet/src/freenet: client/async node

[t...@freenetproject.org]

Author: toad
Date: 2008-09-25 17:25:17 +0000 (Thu, 25 Sep 2008)
New Revision: 22837

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
   branches/db4o/freenet/src/freenet/node/NodeClientCore.java
Log:
Fix another NPE, and a wrong assignment


Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java  
    2008-09-25 17:17:47 UTC (rev 22836)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java  
    2008-09-25 17:25:17 UTC (rev 22837)
@@ -204,14 +204,12 @@

        public synchronized void addPendingKeys(KeyListener listener) {
                keyListeners.add(listener);
-               System.out.println("Added pending keys to "+this+" : size now 
"+keyListeners.size()+" : "+listener);
                Logger.normal(this, "Added pending keys to "+this+" : size now 
"+keyListeners.size()+" : "+listener);
        }

        public synchronized boolean removePendingKeys(KeyListener listener) {
                boolean ret = keyListeners.remove(listener);
                listener.onRemove();
-               System.out.println("Removed pending keys from "+this+" : size 
now "+keyListeners.size()+" : "+listener);
                Logger.normal(this, "Removed pending keys from "+this+" : size 
now "+keyListeners.size()+" : "+listener);
                return ret;
        }
@@ -224,7 +222,6 @@
                                found = true;
                                i.remove();
                                listener.onRemove();
-                               System.out.println("Removed pending keys from 
"+this+" : size now "+keyListeners.size()+" : "+listener);
                                Logger.normal(this, "Removed pending keys from 
"+this+" : size now "+keyListeners.size()+" : "+listener);
                        }
                }

Modified: branches/db4o/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeClientCore.java  2008-09-25 
17:17:47 UTC (rev 22836)
+++ branches/db4o/freenet/src/freenet/node/NodeClientCore.java  2008-09-25 
17:25:17 UTC (rev 22837)
@@ -301,7 +301,7 @@
                                                0, 2, 1, 0, 0, new 
SimpleEventProducer(),
                                                
!Node.DONT_CACHE_LOCAL_REQUESTS), RequestStarter.PREFETCH_PRIORITY_CLASS, 512 
/* FIXME make configurable */);

-               clientContext = new ClientContext(this, fecQueue, 
clientDatabaseExecutor, backgroundBlockEncoder, archiveManager, 
persistentTempBucketFactory, persistentTempBucketFactory, healingQueue, 
uskManager, random, random, null, persistentFilenameGenerator, 
persistentFilenameGenerator);
+               clientContext = new ClientContext(this, fecQueue, 
clientDatabaseExecutor, backgroundBlockEncoder, archiveManager, 
persistentTempBucketFactory, persistentTempBucketFactory, healingQueue, 
uskManager, random, node.fastWeakRandom, node.getTicker(), 
persistentFilenameGenerator, persistentFilenameGenerator);
                storeChecker.setContext(clientContext);

                requestStarters = new RequestStarterGroup(node, this, 
portNumber, random, config, throttleFS, clientContext);