[freenet-cvs] r7643 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2005-11-30 22:28:59 +0000 (Wed, 30 Nov 2005)
New Revision: 7643

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/Version.java
Log:
255: (mandatory)
Hopefully fix rare-ish bug relating to reconnecting.
Also some logging.

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2005-11-30 22:08:47 UTC 
(rev 7642)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2005-11-30 22:28:59 UTC 
(rev 7643)
@@ -215,6 +215,8 @@
             if(pn == exclude) continue;
             if(pn.isConnected()) {
                 v.add(pn);
+            } else {
+               Logger.minor(this, "Excluding "+pn+" because is disconnected");
             }
         }
         int lengthWithoutExcluded = v.size();
@@ -222,8 +224,8 @@
             v.add(exclude);
         PeerNode[] newConnectedPeers = new PeerNode[v.size()];
         newConnectedPeers = (PeerNode[]) v.toArray(newConnectedPeers);
+        Logger.minor(this, "Connected peers (in getRandomPeer): 
"+newConnectedPeers.length+" was "+connectedPeers.length);
         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/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2005-11-30 22:08:47 UTC 
(rev 7642)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2005-11-30 22:28:59 UTC 
(rev 7643)
@@ -611,7 +611,7 @@
         if(thisBootID != this.bootID) {
             connectedTime = System.currentTimeMillis();
             Logger.minor(this, "Changed boot ID from "+bootID+" to 
"+thisBootID);
-            isConnected = false;
+            // We are connected, but we need a new KeyTracker
             if(previousTracker != null) {
                 KeyTracker old = previousTracker;
                 previousTracker = null;

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-30 22:08:47 UTC (rev 
7642)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-30 22:28:59 UTC (rev 
7643)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

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

        /** Oldest build of Fred we will talk to */
-       public static final int lastGoodBuild = 254;
+       public static final int lastGoodBuild = 255;

        /** The highest reported build of fred */
        public static int highestSeenBuild = buildNumber;