diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HtmlPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HtmlPage.java index 9c200f6..1d176d4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HtmlPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HtmlPage.java @@ -78,7 +78,7 @@ protected HtmlPage(ViewContext ctx) { @Override public void render() { - puts(DOCTYPE); + putWithoutEscapeHtml(DOCTYPE); render(page().html().meta_http("X-UA-Compatible", "IE=8") .meta_http("Content-type", MimeType.HTML)); if (page().nestLevel() != 0) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TextView.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TextView.java index 4983dac..7a36c5a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TextView.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TextView.java @@ -40,7 +40,7 @@ protected TextView(ViewContext ctx, String contentType) { } /** - * Print strings as is (no newline, a la php echo). + * Print strings escaping html. * @param args the strings to print */ public void echo(Object... args) { @@ -53,6 +53,17 @@ public void echo(Object... args) { } /** + * Print strings as is (no newline, a la php echo). + * @param args the strings to print + */ + public void echoWithoutEscapeHtml(Object... args) { + PrintWriter out = writer(); + for (Object s : args) { + out.print(s); + } + } + + /** * Print strings as a line (new line appended at the end, a la C/Tcl puts). * @param args the strings to print */ @@ -60,4 +71,13 @@ public void puts(Object... args) { echo(args); writer().println(); } + + /** + * Print string as a line. This does not escapes the string for html + * @param args the strings to print + */ + public void putWithoutEscapeHtml(Object args) { + echoWithoutEscapeHtml(args); + writer().println(); + } } -- 1.9.2.msysgit.0