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

[t...@freenetproject.org]

Author: toad
Date: 2006-11-29 00:48:33 +0000 (Wed, 29 Nov 2006)
New Revision: 11102

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Make name an optional field in post-connection-setup ref exchange.

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2006-11-29 00:46:41 UTC 
(rev 11101)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2006-11-29 00:48:33 UTC 
(rev 11102)
@@ -1733,7 +1733,7 @@
         // The given physical.udp may be WRONG!!!

         String name = fs.get("myName");
-        if(name == null) throw new FSParseException("No name");
+        
         // In future, ARKs may support automatic transition when the ARK key 
is changed.
         // So parse it anyway. If it fails, no big loss; it won't even log an 
error.

@@ -1741,8 +1741,10 @@

         if(parseARK(fs, false))
                changedAnything = true;
-        if(!name.equals(myName)) changedAnything = true;
-        myName = name;
+        if(name != null && !name.equals(myName)) {
+               changedAnything = true;
+            myName = name;
+        }

                return changedAnything;
        }