Changeset 189

Timestamp:

03/06/06 15:27:10 (2 years ago)

Author:

dsandler

Message:

Fix NPE when using -N (new network) flag.

Files:

• feedtree/trunk/src/net/feedtree/core/client/Client.java (modified) (3 diffs)

feedtree/trunk/src/net/feedtree/core/client/Client.java

@@ -280 +280 @@
-                    + localHost + " port " + port + "]");
-            
+            try {
+
+                // Construct the node factory given the *local*
+                // address to bind to (this allows us to select among
+                // multiple network interfaces on the client).  Note
+                // that we're not yet using the (detected) external
+                // IP; that comes later.
+                factory = new SocketPastryNodeFactory(
+                    new RandomNodeIdFactory(g_pastryEnv),
+                    localHost, port, g_pastryEnv);
+
+            } catch (IOException exc) {
+                Logger.global.severe("error: couldn't create node factory; bailing");
+                status.notifyStatus(ClientStatus.STATUS_FATAL_ERROR, 
+                        "Error loading Pastry network code");
+                
+                return null;
+            }
+        
-            if (bootHost != "") {
-                // NAT-detection code loosely cribbed from ePOST
@@ -304 +323 @@
-                        g_publicNodeAddress = new InetSocketAddress(natAddr, port);
-        
-                    try {
-
-                        // Construct the node factory given the *local*
-                        // address to bind to (this allows us to select among
-                        // multiple network interfaces on the client).  Note
-                        // that we're not yet using the (detected) external
-                        // IP; that comes later.
-                        factory = new SocketPastryNodeFactory(
-                            new RandomNodeIdFactory(g_pastryEnv),
-                            natAddr, port, g_pastryEnv);
-
-                    } catch (IOException exc) {
-                        Logger.global.severe("error: couldn't create node factory; bailing");
-                        status.notifyStatus(ClientStatus.STATUS_FATAL_ERROR, 
-                                "Error loading Pastry network code");
-                        
-                        return null;
-                    }
-                
-                    Logger.global.fine("[Contacting bootstrap host "
-                        + bootHost + ":" + bootPort + "]");
@@ -375 +375 @@
-                status.notifyStatus(ClientStatus.STATUS_STARTING,
-                        "Starting new network");
-               
+
-                node = factory.newNode(null);
-