Author: nextgens
Date: 2007-03-03 19:07:09 +0000 (Sat, 03 Mar 2007)
New Revision: 11945
Modified:
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
trunk/freenet/src/freenet/clients/http/NinjaSpider.java
trunk/freenet/src/freenet/clients/http/PluginToadlet.java
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
trunk/freenet/src/freenet/node/Node.java
Log:
Spare some StringBuffer instances on toadlets, remove some dead/obsolete code
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2007-03-03
16:58:31 UTC (rev 11944)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2007-03-03
19:07:09 UTC (rev 11945)
@@ -165,9 +165,7 @@
formNode.addChild("input", new String[] { "type", "value" },
new String[] { "submit", "Apply" });
formNode.addChild("input", new String[] { "type", "value" },
new String[] { "reset", "Reset" });
- StringBuffer pageBuffer = new StringBuffer();
- pageNode.generate(pageBuffer);
- this.writeReply(ctx, 200, "text/html", "OK",
pageBuffer.toString());
+ this.writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
}
public String supportedMethods() {
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-03-03 16:58:31 UTC (rev 11944)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-03-03 19:07:09 UTC (rev 11945)
@@ -607,9 +607,7 @@
// ignore
}
- StringBuffer pageBuffer = new StringBuffer();
- pageNode.generate(pageBuffer);
- this.writeReply(ctx, 200, "text/html", "OK",
pageBuffer.toString());
+ this.writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
}
private String sortString(boolean isReversed, String type) {
@@ -738,9 +736,7 @@
this.writeReply(ctx, 200, "text/html", "OK",
resultString);
return;
}
- StringBuffer pageBuffer = new StringBuffer();
- pageNode.generate(pageBuffer);
- this.writeReply(ctx, 200, "text/html", "OK",
pageBuffer.toString());
+ this.writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
return;
} else if (request.isPartSet("doAction") &&
request.getPartAsString("action",25).equals("update_notes")) {
//int hashcode =
Integer.decode(request.getParam("node")).intValue();
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2007-03-03
16:58:31 UTC (rev 11944)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2007-03-03
19:07:09 UTC (rev 11945)
@@ -325,9 +325,7 @@
errorContent.addChild("br");
errorContent.addChild("a", new String[] { "href",
"title" }, new String[] { "/", "Node homepage" }, "Homepage");
- StringBuffer pageBuffer = new StringBuffer();
- pageNode.generate(pageBuffer);
- this.writeReply(ctx, 400, "text/html", "Invalid key",
pageBuffer.toString());
+ this.writeReply(ctx, 400, "text/html", "Invalid key",
pageNode.generate());
return;
}
String requestedMimeType = httprequest.getParam("type", null);
@@ -407,9 +405,7 @@
optionForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "submit", "download", "Download in
background and store in downloads directory" });
optionList.addChild("li").addChild("a", new
String[] { "href", "title" }, new String[] { "/", "FProxy home page" }, "Abort
and return to the FProxy home page");
- StringBuffer pageBuffer = new StringBuffer();
- pageNode.generate(pageBuffer);
- writeReply(ctx, 200, "text/html", "OK",
pageBuffer.toString());
+ writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
} else {
HTMLNode pageNode =
ctx.getPageMaker().getPageNode(FetchException.getShortMessage(e.mode));
HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
@@ -426,10 +422,8 @@
infoboxContent.addChild("br");
infoboxContent.addChild("a", new String[] {
"href", "title" }, new String[] { "/", "Node homepage" }, "Homepage");
- StringBuffer pageBuffer = new StringBuffer();
- pageNode.generate(pageBuffer);
this.writeReply(ctx, 500 /* close enough -
FIXME probably should depend on status code */,
- "text/html",
FetchException.getShortMessage(e.mode), pageBuffer.toString());
+ "text/html",
FetchException.getShortMessage(e.mode), pageNode.generate());
}
} catch (SocketException e) {
// Probably irrelevant
Modified: trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
2007-03-03 16:58:31 UTC (rev 11944)
+++ trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
2007-03-03 19:07:09 UTC (rev 11945)
@@ -48,8 +48,6 @@
}
currentPath = new File(path).getCanonicalFile();
-
- StringBuffer pageBuffer = new StringBuffer(16384);
PageMaker pageMaker = toadletContext.getPageMaker();
HTMLNode pageNode = pageMaker.getPageNode("Listing of " +
currentPath.getAbsolutePath());
@@ -134,8 +132,7 @@
ulNode.addChild("li", "Check that the specified path is
readable by the user running the node.");
}
- pageNode.generate(pageBuffer);
- writeReply(toadletContext, 200, "text/html; charset=utf-8",
"OK", pageBuffer.toString());
+ writeReply(toadletContext, 200, "text/html; charset=utf-8",
"OK", pageNode.generate());
}
/**
Modified: trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2007-03-03
16:58:31 UTC (rev 11944)
+++ trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2007-03-03
19:07:09 UTC (rev 11945)
@@ -16,7 +16,6 @@
import freenet.node.Node;
import freenet.node.NodeClientCore;
import freenet.node.PeerNode;
-import freenet.node.Version;
import freenet.support.Base64;
import freenet.support.HTMLNode;
import freenet.support.Logger;
@@ -66,9 +65,7 @@
}
if(peernode_name == null) {
contentNode.addChild(createPeerInfobox("infobox-error", "Peer not found", "The
peer with the hash code \u201c" + input_hashcode_string + "\u201d could not be
found."));
- StringBuffer pageBuffer = new StringBuffer();
- pageNode.generate(pageBuffer);
- this.writeReply(ctx, 200, "text/html", "OK",
pageBuffer.toString());
+ this.writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
return;
}
HashMap peers = new HashMap();
@@ -78,9 +75,7 @@
this.writeReply(ctx, 200, "text/html", "OK",
resultString);
return;
}
- StringBuffer pageBuffer = new StringBuffer();
- pageNode.generate(pageBuffer);
- this.writeReply(ctx, 200, "text/html", "OK",
pageBuffer.toString());
+ this.writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
return;
}
MultiValueTable headers = new MultiValueTable();
@@ -139,11 +134,7 @@
fs.put("composedTime", now);
fs.put("sentTime", now);
Message n2ntm;
- if(Version.buildNumber() <
1000) { // FIXME/TODO: This test shouldn't be needed eventually
- n2ntm =
DMT.createNodeToNodeTextMessage(Node.N2N_TEXT_MESSAGE_TYPE_USERALERT,
node.getMyName(), pn.getName(), message);
- } else {
- n2ntm =
DMT.createNodeToNodeMessage(Node.N2N_TEXT_MESSAGE_TYPE_USERALERT,
fs.toString().getBytes("UTF-8"));
- }
+ n2ntm =
DMT.createNodeToNodeMessage(Node.N2N_TEXT_MESSAGE_TYPE_USERALERT,
fs.toString().getBytes("UTF-8"));
if(!pn.isConnected()) {
sendStatusShort =
"Queued";
sendStatusLong =
"Queued: Peer not connected, so message queued for when it connects";
@@ -179,10 +170,8 @@
HTMLNode list = peerTableInfobox.addChild("ul");
list.addChild("li").addChild("a", new String[] {
"href", "title" }, new String[] { "/", "Back to node homepage" }, "Homepage");
list.addChild("li").addChild("a", new String[] {
"href", "title" }, new String[] { "/darknet/", "Back to darknet connections" },
"Darknet connections");
- StringBuffer pageBuffer = new StringBuffer();
- pageNode.generate(pageBuffer);
- this.writeReply(ctx, 200, "text/html", "OK",
pageBuffer.toString());
- return;
+ this.writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
+ return;
}
MultiValueTable headers = new MultiValueTable();
headers.put("Location", "/darknet/");
@@ -192,9 +181,7 @@
public static String createN2NTMSendForm(HTMLNode pageNode, HTMLNode
contentNode, ToadletContext ctx, HashMap peers) throws
ToadletContextClosedException, IOException {
if(contentNode == null) {
contentNode.addChild(createPeerInfobox("infobox-error",
"Internal error", "Internal error: N2NTMToadlet.createN2NTMSendForm() not
passed a valid contentNode."));
- StringBuffer pageBuffer = new StringBuffer();
- pageNode.generate(pageBuffer);
- return pageBuffer.toString();
+ return pageNode.generate();
}
HTMLNode infobox = contentNode.addChild("div", new String[] {
"class", "id" }, new String[] { "infobox", "n2nbox" });
infobox.addChild("div", "class", "infobox-header", "Send Node
to Node Text Message");
Modified: trunk/freenet/src/freenet/clients/http/NinjaSpider.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/NinjaSpider.java 2007-03-03
16:58:31 UTC (rev 11944)
+++ trunk/freenet/src/freenet/clients/http/NinjaSpider.java 2007-03-03
19:07:09 UTC (rev 11945)
@@ -577,9 +577,7 @@
}
}
MultiValueTable responseHeaders = new MultiValueTable();
- StringBuffer pageBuffer = new StringBuffer();
- pageNode.generate(pageBuffer);
- byte[] responseBytes = pageBuffer.toString().getBytes();
+ byte[] responseBytes = pageNode.generate().getBytes();
context.sendReplyHeaders(200, "OK", responseHeaders,
"text/html; charset=utf-8", responseBytes.length);
context.writeData(responseBytes);
} else if ("add".equals(action)) {
@@ -616,9 +614,7 @@
HTMLNode infobox = contentNode.addChild("div", "class",
"infobox infobox-alert");
infobox.addChild("div", "class", "infobox-header", title);
infobox.addChild("div", "class", "infobox-content", message);
- StringBuffer pageBuffer = new StringBuffer();
- pageNode.generate(pageBuffer);
- byte[] responseBytes = pageBuffer.toString().getBytes("utf-8");
+ byte[] responseBytes = pageNode.generate().getBytes("utf-8");
context.sendReplyHeaders(200, "OK", new MultiValueTable(),
"text/html; charset=utf-8", responseBytes.length);
context.writeData(responseBytes);
}
Modified: trunk/freenet/src/freenet/clients/http/PluginToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PluginToadlet.java 2007-03-03
16:58:31 UTC (rev 11944)
+++ trunk/freenet/src/freenet/clients/http/PluginToadlet.java 2007-03-03
19:07:09 UTC (rev 11945)
@@ -192,7 +192,7 @@
* The toadlet context
* @return A StringBuffer containing the HTML page
*/
- private StringBuffer listPlugins(ToadletContext context) {
+ private String listPlugins(ToadletContext context) {
Plugin[] plugins = pluginManager.getPlugins();
PageMaker pageMaker = context.getPageMaker();
HTMLNode pageNode = pageMaker.getPageNode("List of Plugins");
@@ -228,9 +228,7 @@
contentNode.addChild(createAddPluginBox(context));
- StringBuffer pageBuffer = new StringBuffer();
- pageNode.generate(pageBuffer);
- return pageBuffer;
+ return pageNode.generate();
}
/**
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2007-03-03
16:58:31 UTC (rev 11944)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2007-03-03
19:07:09 UTC (rev 11945)
@@ -89,7 +89,6 @@
writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
Logger.normal(this, "Node is updating/restarting");
node.getNodeUpdater().arm();
- return;
}else if
(request.getPartAsString(GenericReadFilterCallback.magicHTTPEscapeString,
MAX_URL_LENGTH).length()>0){
if(noPassword) {
redirectToRoot(ctx);
@@ -101,7 +100,6 @@
url =
request.getPartAsString(GenericReadFilterCallback.magicHTTPEscapeString,
MAX_URL_LENGTH);
headers.put("Location", url==null ? "/" : url);
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
- return;
}else if (request.getPartAsString("update", 32).length() > 0) {
HTMLNode pageNode =
ctx.getPageMaker().getPageNode("Node Update");
HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
@@ -112,7 +110,6 @@
updateForm.addChild("input", new String[] { "type",
"name", "value" }, new String[] { "submit", "cancel", "Cancel" });
updateForm.addChild("input", new String[] { "type",
"name", "value" }, new String[] { "submit", "updateconfirm", "Update" });
writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
- return;
}else if(request.isPartSet("getThreadDump")) {
if(noPassword) {
redirectToRoot(ctx);
@@ -130,7 +127,6 @@
ctx.getPageMaker().getContentNode(infobox).addChild("#", "It's not possible to
make the node generate a thread dump if you aren't using the wrapper!");
}
this.writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
- return;
}else if(request.isPartSet("getJEStatsDump")) {
if(noPassword) {
redirectToRoot(ctx);
@@ -146,7 +142,6 @@
ctx.getPageMaker().getContentNode(infobox).addChild("#", "Runtime database
statistics have been written to the wrapper logfile");
this.writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
- return;
}else if (request.isPartSet("addbookmark")) {
if(noPassword) {
redirectToRoot(ctx);
@@ -385,7 +380,6 @@
infoboxContent.addChild("#", "Thank you for using
Freenet.");
writeReply(ctx, 200, "text/html; charset=utf-8", "OK",
pageNode.generate());
this.node.exit("Shutdown from fproxy");
- return;
}else if(request.isPartSet("restartconfirm")){
if(noPassword) {
redirectToRoot(ctx);
@@ -400,7 +394,6 @@
writeReply(ctx, 200, "text/html; charset=utf-8", "OK",
pageNode.generate());
Logger.normal(this, "Node is restarting");
node.getNodeStarter().restart();
- return;
}else {
redirectToRoot(ctx);
}
@@ -447,9 +440,7 @@
this.writeReply(ctx, 200, "text/plain", "OK",
sw.toString());
return;
- }
-
- if (request.getParam("newbookmark").length() > 0) {
+ }else if (request.getParam("newbookmark").length() > 0) {
HTMLNode pageNode = ctx.getPageMaker().getPageNode("Add
a Bookmark");
HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
HTMLNode infobox =
contentNode.addChild(ctx.getPageMaker().getInfobox("Confirm Bookmark
Addition"));
@@ -467,7 +458,6 @@
HTMLNode warnbox =
contentNode.addChild(ctx.getPageMaker().getInfobox("infobox-warning", "External
link"));
HTMLNode externalLinkForm =
ctx.addFormChild(ctx.getPageMaker().getContentNode(warnbox), "/",
"confirmExternalLinkForm");
- // FIXME: has
request.getParam(GenericReadFilterCallback.magicHTTPEscapeString) been
sanityzed ?
final String target =
request.getParam(GenericReadFilterCallback.magicHTTPEscapeString);
externalLinkForm.addChild("#", "Please confirm that you
want to go to " + target + ". WARNING: You are leaving FREENET! Clicking on
this link WILL seriously jeopardize your anonymity!. It is strongly recommended
not to do so!");
externalLinkForm.addChild("br");
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2007-03-03 16:58:31 UTC (rev
11944)
+++ trunk/freenet/src/freenet/node/Node.java 2007-03-03 19:07:09 UTC (rev
11945)
@@ -888,8 +888,7 @@
aggressiveGCModificator = val;
}
});
- if(lastVersion <= 954)
- nodeConfig.fixOldDefault("aggressiveGC", "250");
+
aggressiveGCModificator = nodeConfig.getInt("aggressiveGC");
//Memory Checking thread
@@ -1316,7 +1315,6 @@
});
- if(lastVersion <= 1007)
nodeConfig.fixOldDefault("databaseMaxMemory", "0"); // FIXME remove; 1007 had a
bug which reset this to 0
databaseMaxMemory = nodeConfig.getLong("databaseMaxMemory");
envMutableConfig.setCacheSize(databaseMaxMemory);
@@ -3601,7 +3599,7 @@
}
// FIXME put this somewhere else
- private final Object statsSync = new Object();
+ private volatile Object statsSync = new Object();
/** The total number of bytes of real data i.e. payload sent by the
node */
private long totalPayloadSent;
