[freenet-cvs] r9353 - in trunk/freenet/src/freenet: client/async io node

[t...@freenetproject.org]

Author: toad
Date: 2006-06-22 18:39:47 +0000 (Thu, 22 Jun 2006)
New Revision: 9353

Modified:
   trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
   trunk/freenet/src/freenet/io/NetworkInterface.java
   trunk/freenet/src/freenet/node/Version.java
Log:
837: Fix bug in new scheduler (client -> clientrequester not the other way 
around!!), and logging.

Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2006-06-22 16:09:46 UTC (rev 9352)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2006-06-22 18:39:47 UTC (rev 9353)
@@ -118,12 +118,12 @@
                        Logger.minor(this, "Registering retry count 
"+retryCount+" with prioclass "+priorityClass);
                }
                // Request
-               SectoredRandomGrabArrayWithClient requestGrabber = 
(SectoredRandomGrabArrayWithClient) clientGrabber.getGrabber(cr);
+               SectoredRandomGrabArrayWithClient requestGrabber = 
(SectoredRandomGrabArrayWithClient) clientGrabber.getGrabber(client);
                if(requestGrabber == null) {
-                       requestGrabber = new 
SectoredRandomGrabArrayWithClient(cr, random);
-                       clientGrabber.addGrabber(cr, requestGrabber);
+                       requestGrabber = new 
SectoredRandomGrabArrayWithClient(client, random);
+                       clientGrabber.addGrabber(client, requestGrabber);
                }
-               clientGrabber.add(client, req);
+               clientGrabber.add(cr, req);
        }

        public synchronized SendableRequest removeFirst() {

Modified: trunk/freenet/src/freenet/io/NetworkInterface.java
===================================================================
--- trunk/freenet/src/freenet/io/NetworkInterface.java  2006-06-22 16:09:46 UTC 
(rev 9352)
+++ trunk/freenet/src/freenet/io/NetworkInterface.java  2006-06-22 18:39:47 UTC 
(rev 9353)
@@ -290,7 +290,9 @@
                                                Logger.normal(Acceptor.class, 
"Denied connection to " + clientHostName);
                                        }
                                } catch (SocketTimeoutException ste1) {
+                                       Logger.minor(this, "Timeout");
                                } catch (IOException ioe1) {
+                                       Logger.minor(this, "Caught "+ioe1);
                                }
                        }
                }

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-06-22 16:09:46 UTC (rev 
9352)
+++ trunk/freenet/src/freenet/node/Version.java 2006-06-22 18:39:47 UTC (rev 
9353)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 836;
+       private static final int buildNumber = 837;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 765;