[freenet-cvs] r7633 - in trunk/freenet/src/freenet: client node

[t...@freenetproject.org]

Author: toad
Date: 2005-11-29 20:16:42 +0000 (Tue, 29 Nov 2005)
New Revision: 7633

Modified:
   trunk/freenet/src/freenet/client/RetryTracker.java
   trunk/freenet/src/freenet/node/PeerManager.java
   trunk/freenet/src/freenet/node/Version.java
Log:
247:
Minor bugfix.

Modified: trunk/freenet/src/freenet/client/RetryTracker.java
===================================================================
--- trunk/freenet/src/freenet/client/RetryTracker.java  2005-11-29 19:39:41 UTC 
(rev 7632)
+++ trunk/freenet/src/freenet/client/RetryTracker.java  2005-11-29 20:16:42 UTC 
(rev 7633)
@@ -112,6 +112,7 @@

        /** Remove a level */
        private synchronized void removeLevel(int level) {
+               Logger.minor(this, "Removing level "+level);
                Integer x = new Integer(level);
                levels.remove(x);
                if(curMinLevel == level) {
@@ -140,11 +141,16 @@

        /** Add a level */
        private synchronized Level addLevel(int level, Integer x) {
+               Logger.minor(this, "Adding level "+level);
                if(level < 0) throw new IllegalArgumentException();
                Level l = new Level(level);
+               if(levels.isEmpty()) {
+                       curMaxLevel = curMinLevel = level;
+               } else {
+                       if(level > curMaxLevel) curMaxLevel = level;
+                       if(level < curMinLevel) curMinLevel = level;
+               }
                levels.put(x, l);
-               if(level > curMaxLevel) curMaxLevel = level;
-               if(level < curMinLevel) curMinLevel = level;
                return l;
        }


Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2005-11-29 19:39:41 UTC 
(rev 7632)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2005-11-29 20:16:42 UTC 
(rev 7633)
@@ -223,6 +223,7 @@
         PeerNode[] newConnectedPeers = new PeerNode[v.size()];
         newConnectedPeers = (PeerNode[]) v.toArray(newConnectedPeers);
         connectedPeers = newConnectedPeers;
+        Logger.minor(this, "Connected peers (in getRandomPeer): 
"+connectedPeers.length);
         if(lengthWithoutExcluded == 0) return null;
         return connectedPeers[node.random.nextInt(lengthWithoutExcluded)];
     }

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-29 19:39:41 UTC (rev 
7632)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-29 20:16:42 UTC (rev 
7633)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 246;
+       public static final int buildNumber = 247;

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