[freenet-cvs] r13441 - trunk/freenet/src/freenet/clients/http

[t...@freenetproject.org]

Author: toad
Date: 2007-06-01 14:43:22 +0000 (Fri, 01 Jun 2007)
New Revision: 13441

Modified:
   trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
   trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
Log:
It never returns anything.

Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2007-06-01 14:41:13 UTC (rev 13440)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2007-06-01 14:43:22 UTC (rev 13441)
@@ -737,11 +737,7 @@
                                        }
                                }
                        }
-                       String resultString = N2NTMToadlet.createN2NTMSendForm( 
pageNode, contentNode, ctx, peers);
-                       if(resultString != null) {  // was there an error in 
createN2NTMSendForm()?
-                               this.writeReply(ctx, 200, "text/html", "OK", 
resultString);
-                               return;
-                       }
+                       N2NTMToadlet.createN2NTMSendForm( pageNode, 
contentNode, ctx, peers);
                        this.writeReply(ctx, 200, "text/html", "OK", 
pageNode.generate());
                        return;
                } else if (request.isPartSet("doAction") && 
request.getPartAsString("action",25).equals("update_notes")) {

Modified: trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java    2007-06-01 
14:41:13 UTC (rev 13440)
+++ trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java    2007-06-01 
14:43:22 UTC (rev 13441)
@@ -90,13 +90,7 @@
                        }
                        HashMap peers = new HashMap();
                        peers.put(input_hashcode_string, peernode_name);
-                       String resultString = createN2NTMSendForm(pageNode, 
contentNode,
-                                       ctx, peers);
-                       if (resultString != null) { // was there an error in
-                                                                               
// createN2NTMSendForm()?
-                               this.writeReply(ctx, 200, "text/html", "OK", 
resultString);
-                               return;
-                       }
+                       createN2NTMSendForm(pageNode, contentNode, ctx, peers);
                        this.writeReply(ctx, 200, "text/html", "OK", 
pageNode.generate());
                        return;
                }
@@ -244,7 +238,7 @@
                ctx.sendReplyHeaders(302, "Found", headers, null, 0);
        }

-       public static String createN2NTMSendForm(HTMLNode pageNode,
+       public static void createN2NTMSendForm(HTMLNode pageNode,
                        HTMLNode contentNode, ToadletContext ctx, HashMap peers)
                        throws ToadletContextClosedException, IOException {
                HTMLNode infobox = contentNode.addChild("div", new String[] { 
"class",
@@ -275,6 +269,5 @@
                messageForm.addChild("br");
                messageForm.addChild("input", new String[] { "type", "name", 
"value" },
                                new String[] { "submit", "send", 
l10n("sendMessageShort") });
-               return null;
        }
 }