Author: nextgens
Date: 2006-05-24 13:35:54 +0000 (Wed, 24 May 2006)
New Revision: 8842
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
Log:
Doh. We don't terminate requests
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-05-23 23:18:39 UTC (rev 8841)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-05-24 13:35:54 UTC (rev 8842)
@@ -348,6 +348,7 @@
}
} catch (IOException e) {
this.sendErrorPage(ctx, 200, "Failed To
Add Node", "Unable to retrieve node reference from " +
HTMLEncoder.encode(urltext) + ".<br /> <a href=\".\">Please try again</a>.");
+ return;
} finally {
if( in != null ){
in.close();
@@ -405,6 +406,7 @@
this.node.removeDarknetConnection(peerNodes[i]);
}
}
+ return;
}
this.handleGet(uri, ctx);
}
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-05-23
23:18:39 UTC (rev 8841)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-05-24
13:35:54 UTC (rev 8842)
@@ -78,6 +78,7 @@
writeReply(ctx, 200, "text/html", "OK", buf.toString());
this.node.exit();
+ return;
}else if(request.getParam("restartconfirm").length() > 0){
// false for no navigation bars, because that would be
very silly
ctx.getPageMaker().makeHead(buf, "Node Restart", false);
@@ -95,6 +96,7 @@
writeReply(ctx, 200, "text/html", "OK", buf.toString());
Logger.normal(this, "Node is restarting");
node.getNodeStarter().restart();
+ return;
}else if (request.getParam("restart").length() > 0) {
ctx.getPageMaker().makeHead(buf, "Node Restart");
buf.append("<div class=\"infobox infobox-query\">\n");
@@ -111,6 +113,7 @@
buf.append("</div>\n");
ctx.getPageMaker().makeTail(buf);
writeReply(ctx, 200, "text/html", "OK", buf.toString());
+ return;
} else if (request.getParam("exit").equalsIgnoreCase("true")) {
ctx.getPageMaker().makeHead(buf, "Node Shutdown");
buf.append("<div class=\"infobox infobox-query\">\n");
@@ -127,6 +130,7 @@
buf.append("</div>\n");
ctx.getPageMaker().makeTail(buf);
writeReply(ctx, 200, "text/html", "OK", buf.toString());
+ return;
} else if (request.isParameterSet("addbookmark")) {
try {
bookmarks.addBookmark(new
Bookmark(request.getParam("key"), request.getParam("name")));
@@ -166,14 +170,14 @@
try {
this.handleGet(new
URI("/welcome/?managebookmarks"), ctx);
} catch (URISyntaxException ex) {
-
+ return;
}
}
}
try {
this.handleGet(new
URI("/welcome/?managebookmarks"), ctx);
} catch (URISyntaxException ex) {
-
+ return;
}
}else if(request.isParameterSet("disable")){
UserAlert[] alerts=node.alerts.getAlerts();
