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

[t...@freenetproject.org]

Author: toad
Date: 2007-12-18 16:43:17 +0000 (Tue, 18 Dec 2007)
New Revision: 16686

Modified:
   trunk/freenet/src/freenet/node/DarknetPeerNode.java
   trunk/freenet/src/freenet/node/OpennetPeerNode.java
Log:
OpennetPeerNode, DarknetPeerNode not equal to other type of PeerNode with the 
same identity.

Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2007-12-18 16:35:01 UTC 
(rev 16685)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2007-12-18 16:43:17 UTC 
(rev 16686)
@@ -1521,4 +1521,13 @@
        protected boolean generateIdentityFromPubkey() {
                return false;
        }
+       
+       public boolean equals(Object o) {
+               if(o == this) return true;
+               // Only equal to seednode of its own type.
+               if(o instanceof DarknetPeerNode) {
+                       return super.equals(o);
+               } else return false;
+       }
+       
 }

Modified: trunk/freenet/src/freenet/node/OpennetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetPeerNode.java 2007-12-18 16:35:01 UTC 
(rev 16685)
+++ trunk/freenet/src/freenet/node/OpennetPeerNode.java 2007-12-18 16:43:17 UTC 
(rev 16686)
@@ -84,5 +84,13 @@
        protected boolean generateIdentityFromPubkey() {
                return false;
        }
-    
+ 
+       public boolean equals(Object o) {
+               if(o == this) return true;
+               // Only equal to seednode of its own type.
+               if(o instanceof OpennetPeerNode) {
+                       return super.equals(o);
+               } else return false;
+       }
+       
 }