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

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-12-02 14:16:59 +0000 (Sun, 02 Dec 2007)
New Revision: 16205

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Fix a variable shadowing in PeerManager and a typo preventing version informations from beeing parsed.

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java	2007-12-02 11:40:07 UTC (rev 16204)
+++ trunk/freenet/src/freenet/node/PeerManager.java	2007-12-02 14:16:59 UTC (rev 16205)
@@ -1260,29 +1260,29 @@
         synchronized (this) {
 			peers = myPeers;
 		}
-		PeerNodeStatus[] peerNodeStatuses = new PeerNodeStatus[peers.length];
+		PeerNodeStatus[] _peerNodeStatuses = new PeerNodeStatus[peers.length];
 		for (int peerIndex = 0, peerCount = peers.length; peerIndex < peerCount; peerIndex++) {
-			peerNodeStatuses[peerIndex] = peers[peerIndex].getStatus();
+			_peerNodeStatuses[peerIndex] = peers[peerIndex].getStatus();
 		}
-		return peerNodeStatuses;
+		return _peerNodeStatuses;
 	}
 
 	public DarknetPeerNodeStatus[] getDarknetPeerNodeStatuses() {
         DarknetPeerNode[] peers = getDarknetPeers();
-		DarknetPeerNodeStatus[] peerNodeStatuses = new DarknetPeerNodeStatus[peers.length];
+		DarknetPeerNodeStatus[] _peerNodeStatuses = new DarknetPeerNodeStatus[peers.length];
 		for (int peerIndex = 0, peerCount = peers.length; peerIndex < peerCount; peerIndex++) {
-			peerNodeStatuses[peerIndex] = (DarknetPeerNodeStatus) peers[peerIndex].getStatus();
+			_peerNodeStatuses[peerIndex] = (DarknetPeerNodeStatus) peers[peerIndex].getStatus();
 		}
-		return peerNodeStatuses;
+		return _peerNodeStatuses;
 	}
 
 	public OpennetPeerNodeStatus[] getOpennetPeerNodeStatuses() {
         OpennetPeerNode[] peers = getOpennetPeers();
-		OpennetPeerNodeStatus[] peerNodeStatuses = new OpennetPeerNodeStatus[peers.length];
+		OpennetPeerNodeStatus[] _peerNodeStatuses = new OpennetPeerNodeStatus[peers.length];
 		for (int peerIndex = 0, peerCount = peers.length; peerIndex < peerCount; peerIndex++) {
-			peerNodeStatuses[peerIndex] = (OpennetPeerNodeStatus) peers[peerIndex].getStatus();
+			_peerNodeStatuses[peerIndex] = (OpennetPeerNodeStatus) peers[peerIndex].getStatus();
 		}
-		return peerNodeStatuses;
+		return _peerNodeStatuses;
 	}
 
 	/**

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java	2007-12-02 11:40:07 UTC (rev 16204)
+++ trunk/freenet/src/freenet/node/PeerNode.java	2007-12-02 14:16:59 UTC (rev 16205)
@@ -1556,7 +1556,7 @@
 			node.peers.addConnectedPeer(this);
 			onConnect();
 		}
-
+		
 		setPeerNodeStatus(now);
 		return true;
 	}
@@ -1798,18 +1798,16 @@
 			throw new FSParseException(err);
 		}
 		String newVersion = fs.get("version");
-		if(newVersion == null)
+		if(newVersion == null) {
 			// Version may be ommitted for an ARK.
-
 			if(!forARK)
 				throw new FSParseException("No version");
-		else {
+		} else {
 			if(!newVersion.equals(version))
 				changedAnything = true;
 			version = newVersion;
 			Version.seenVersion(newVersion);
 		}
-
 		lastGoodVersion = fs.get("lastGoodVersion");
 
 		updateShouldDisconnectNow();