You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jh...@apache.org on 2018/12/15 00:05:04 UTC
[33/50] [abbrv] hadoop git commit: YARN-9036. Escape newlines in
health report in YARN UI. Contributed by Keqiu Hu
YARN-9036. Escape newlines in health report in YARN UI. Contributed by Keqiu Hu
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f9ea6f32
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f9ea6f32
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f9ea6f32
Branch: refs/heads/branch-2-jhung-test
Commit: f9ea6f32aeddfbf993d287733f75e79c7009d8fb
Parents: 7144eef
Author: Jonathan Hung <jh...@jhung-ld3.linkedin.biz>
Authored: Fri Nov 30 10:04:06 2018 -0800
Committer: Jonathan Hung <jy...@gmail.com>
Committed: Fri Dec 14 16:03:56 2018 -0800
----------------------------------------------------------------------
.../hadoop/yarn/server/resourcemanager/webapp/NodesPage.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f9ea6f32/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
index c03df63..c3a4897 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.yarn.server.resourcemanager.webapp;
import com.google.inject.Inject;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.yarn.api.records.NodeState;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
@@ -200,8 +201,9 @@ class NodesPage extends RmView {
nodeTableData.length() - 1);
}
nodeTableData.append("]");
+ String nodeTableDataEscaped = StringEscapeUtils.escapeJava(nodeTableData.toString());
html.script().$type("text/javascript")
- ._("var nodeTableData=" + nodeTableData)._();
+ ._("var nodeTableData=" + nodeTableDataEscaped)._();
tbody._()._();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org