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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-11-19 15:59:22 +0000 (Mon, 19 Nov 2007)
New Revision: 15831

Modified:
   trunk/freenet/src/freenet/clients/http/StartupToadletServer.java
Log:
StartupToadlet: simplify the logic

Modified: trunk/freenet/src/freenet/clients/http/StartupToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StartupToadletServer.java    
2007-11-19 15:51:13 UTC (rev 15830)
+++ trunk/freenet/src/freenet/clients/http/StartupToadletServer.java    
2007-11-19 15:59:22 UTC (rev 15831)
@@ -96,9 +96,11 @@
                 if(logs.exists() && logs.isFile() && logs.canRead() && logSize 
> 0) {
                     HTMLNode logInfobox = 
contentNode.addChild(ctx.getPageMaker().getInfobox("infobox-info", "Current 
status"));
                     HTMLNode logInfoboxContent = 
ctx.getPageMaker().getContentNode(logInfobox);
-                    String content = FileUtil.readUTF(logs, (logSize < 2000 ? 
0 : logSize - 2000));
+                    boolean isShortFile = logSize < 2000;
+                    String content = FileUtil.readUTF(logs, (isShortFile ? 0 : 
logSize - 2000));
                     int eol = content.indexOf('\n');
-                    logInfoboxContent.addChild("%", content.substring((eol < 0 
? 0 : eol+1)).replaceAll("\n", "<br>\n"));
+                    boolean shallStripFirstLine = (!isShortFile) && (eol > 0);
+                    logInfoboxContent.addChild("%", 
content.substring((shallStripFirstLine ? eol+1 : 0)).replaceAll("\n", 
"<br>\n"));
                 }
                 //TODO: send a Retry-After header ?
                 writeHTMLReply(ctx, 503, desc, pageNode.generate());