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

[t...@freenetproject.org]

Author: toad
Date: 2006-06-13 16:52:00 +0000 (Tue, 13 Jun 2006)
New Revision: 9182

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
Log:
810: Fix an NPE when the IP is undetectable.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-06-13 12:48:08 UTC (rev 
9181)
+++ trunk/freenet/src/freenet/node/Node.java    2006-06-13 16:52:00 UTC (rev 
9182)
@@ -2145,10 +2145,10 @@
                                        best = cur;
                                }
                        }
-                       lastIPAddress = new FreenetInetAddress(best);
+                       lastIPAddress = best == null ? null : new 
FreenetInetAddress(best);
                }
                else {
-                       lastIPAddress = new FreenetInetAddress(oldIPAddress);
+                       lastIPAddress = oldIPAddress == null ? null : new 
FreenetInetAddress(oldIPAddress);
                }
                if (lastIPAddress == null) {
                        this.alerts.register(primaryIPUndetectedAlert);

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-06-13 12:48:08 UTC (rev 
9181)
+++ trunk/freenet/src/freenet/node/Version.java 2006-06-13 16:52:00 UTC (rev 
9182)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 809;
+       private static final int buildNumber = 810;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 765;