[freenet-cvs] r8664 - in trunk/freenet/src/freenet: clients/http io/comm node

[t...@freenetproject.org]

Author: toad
Date: 2006-05-11 18:22:18 +0000 (Thu, 11 May 2006)
New Revision: 8664

Modified:
   trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
   trunk/freenet/src/freenet/io/comm/Peer.java
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
Log:
692: Stop inserting ARKs when we are up to date.

Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java   2006-05-11 
18:09:31 UTC (rev 8663)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java   2006-05-11 
18:22:18 UTC (rev 8664)
@@ -58,6 +58,7 @@
                                                        
o[j].setValue(request.getParam(prefix+"."+configName));
                                                }catch(Exception e){
                                                        
errbuf.append(o[j].getName()+" "+e+"\n");
+                                                       Logger.error(this, 
"Caught "+e, e);
                                                }
                                        }
                                }

Modified: trunk/freenet/src/freenet/io/comm/Peer.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Peer.java 2006-05-11 18:09:31 UTC (rev 
8663)
+++ trunk/freenet/src/freenet/io/comm/Peer.java 2006-05-11 18:22:18 UTC (rev 
8664)
@@ -135,6 +135,7 @@
                if (this == o) {
                        return true;
                }
+               if(o == null) return false;
                if (!(o instanceof Peer)) {
                        return false;
                }
@@ -236,6 +237,7 @@
         * known, return it, otherwise return the textual IP address.
         */
        public static String getHostName(InetAddress primaryIPAddress) {
+               if(primaryIPAddress == null) return null;
                String s = primaryIPAddress.toString();
                String addr = s.substring(0, s.indexOf('/')).trim();
                if(addr.length() == 0)

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-05-11 18:09:31 UTC (rev 
8663)
+++ trunk/freenet/src/freenet/node/Node.java    2006-05-11 18:22:18 UTC (rev 
8664)
@@ -198,8 +198,10 @@
                        Logger.minor(this, "ARK insert succeeded");
                        synchronized(this) {
                                inserter = null;
-                               if(shouldInsert)
+                               if(shouldInsert) {
+                                       shouldInsert = false;
                                        startInserter();
+                               }
                        }
                }


Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-11 18:09:31 UTC (rev 
8663)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-11 18:22:18 UTC (rev 
8664)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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