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

[t...@freenetproject.org]

Author: toad
Date: 2006-04-04 20:41:11 +0000 (Tue, 04 Apr 2006)
New Revision: 8459

Modified:
   trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
   trunk/freenet/src/freenet/node/Version.java
Log:
621: Fixed the infamous CSS replacement bug!

Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2006-04-04 20:18:20 UTC (rev 8458)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2006-04-04 20:41:11 UTC (rev 8459)
@@ -212,7 +212,7 @@
                                                ref += line+"\n";
                                        }
                                } catch (Exception e) {
-                                       this.sendErrorPage(ctx, 200, "Failed to 
add node", "Unable to retrieve node reference from "+urltext+".");
+                                       this.sendErrorPage(ctx, 200, "OK", 
"Failed to add node: Unable to retrieve node reference from "+urltext+".");
                                }
                        } else if (reftext.length() > 0) {
                                // read from post data or file upload
@@ -222,7 +222,7 @@
                                        ref = ref.substring(0, ref.length() - 
1);
                                }
                        } else {
-                               this.sendErrorPage(ctx, 200, "Failed to add 
node", "Could not detect either a node reference or a URL. Please <a 
href=\".\">Try again</a>.");
+                               this.sendErrorPage(ctx, 200, "OK", "Failed to 
add node: Could not detect either a node reference or a URL. Please <a 
href=\".\">Try again</a>.");
                                request.freeParts();
                                return;
                        }
@@ -249,6 +249,7 @@
                        }
                        if(!this.node.addDarknetConnection(pn)) {
                                this.sendErrorPage(ctx, 200, "Failed to add 
node", "We already have the given reference. Return to the connections page <a 
href=\".\">here</a>.");
+                               return;
                        }
                } else if (request.isPartSet("disconnect")) {
                        //int hashcode = 
Integer.decode(request.getParam("node")).intValue();

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-04-04 20:18:20 UTC (rev 
8458)
+++ trunk/freenet/src/freenet/node/Version.java 2006-04-04 20:41:11 UTC (rev 
8459)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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