Repository: struts Updated Branches: refs/heads/master 8759bbc68 -> bd99677b1
Escapes return value of toString() plus adds missing toString() implementations Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bd99677b Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bd99677b Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bd99677b Branch: refs/heads/master Commit: bd99677b198c8c7d65ff8c3a8b24a64958e42442 Parents: 8759bbc Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Wed Nov 16 12:45:40 2016 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Wed Nov 16 12:45:40 2016 +0100 ---------------------------------------------------------------------- .../org/apache/struts2/dispatcher/Parameter.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/bd99677b/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java b/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java index f273513..6686f1a 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java @@ -1,5 +1,6 @@ package org.apache.struts2.dispatcher; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -85,14 +86,22 @@ public interface Parameter { @Override public String toString() { - return getValue(); + return StringEscapeUtils.escapeHtml4(getValue()); } } class File extends Request { + public File(String name, Object value) { super(name, value); } + + @Override + public String toString() { + return "File{" + + "name='" + getName() + '\'' + + '}'; + } } class Empty implements Parameter { @@ -132,6 +141,13 @@ public interface Parameter { public Object getObject() { return null; } + + @Override + public String toString() { + return "Empty{" + + "name='" + name + '\'' + + '}'; + } } }
