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

[toad at freenetproject.org]

Author: toad
Date: 2008-03-01 02:00:03 +0000 (Sat, 01 Mar 2008)
New Revision: 18279

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
Log:
Don't break new connections - add to connectedPeers if isConnected && isRealConnection.
Otherwise we get nasty breakage e.g. not adding because it hasn't got a location yet.

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java	2008-03-01 01:50:42 UTC (rev 18278)
+++ trunk/freenet/src/freenet/node/PeerManager.java	2008-03-01 02:00:03 UTC (rev 18279)
@@ -373,10 +373,14 @@
 	
     public void addConnectedPeer(PeerNode pn) {
     	logMINOR = Logger.shouldLog(Logger.MINOR, this);
-    	if(!pn.isRoutable()) {
-    		if(logMINOR) Logger.minor(this, "Not ReallyConnected: "+pn);
+    	if(!pn.isRealConnection()) {
+    		if(logMINOR) Logger.minor(this, "Not a real connection: "+pn);
     		return;
     	}
+    	if(!pn.isConnected()) {
+    		if(logMINOR) Logger.minor(this, "Not connected: "+pn);
+    		return;
+    	}
     	synchronized(this) {
         for(int i=0;i<connectedPeers.length;i++) {
             if(connectedPeers[i] == pn) {