[freenet-cvs] r8263 - in trunk/freenet/src/freenet: clients/http node

[d...@freenetproject.org]

Author: dbkr
Date: 2006-03-16 03:06:23 +0000 (Thu, 16 Mar 2006)
New Revision: 8263

Modified:
   trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
   trunk/freenet/src/freenet/node/Version.java
Log:
543: Fix an NPE in DarknetConnectionsToadlet since getDetectedPeer() can be null


Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2006-03-16 02:53:32 UTC (rev 8262)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2006-03-16 03:06:23 UTC (rev 8263)
@@ -85,7 +85,7 @@

                        row[0] = status;
                        row[1] = HTMLEncoder.encode(pn.getName());
-                       row[2] = pn.getDetectedPeer().toString();
+                       row[2] = pn.getDetectedPeer() != null ? 
pn.getDetectedPeer().toString() : "(address unknown)";
                        row[3] = pn.getVersion();
                        row[4] = new Double(pn.getLocation().getValue());
                        row[5] = new Long(Math.max(backedOffUntil - now, 0));

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-16 02:53:32 UTC (rev 
8262)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-16 03:06:23 UTC (rev 
8263)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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