commit | 5e7c921d4d41d8a89fea66c3a1bef97506ba3e91 | [log] [tgz] |
---|---|---|
author | Lukasz Lenart <lukaszlenart@apache.org> | Mon Aug 17 09:45:15 2020 +0200 |
committer | Lukasz Lenart <lukaszlenart@apache.org> | Mon Aug 17 09:45:15 2020 +0200 |
tree | ce9a0cf166c770471b24e7c34f35cf991ad42cde | |
parent | 6df90bff3b1734274983dcf1ffc7567d219ff54d [diff] |
WW-5086 Fixes s:set tag to persists empty body
diff --git a/core/src/main/java/org/apache/struts2/components/Set.java b/core/src/main/java/org/apache/struts2/components/Set.java index fb2a366..ff1a27c 100644 --- a/core/src/main/java/org/apache/struts2/components/Set.java +++ b/core/src/main/java/org/apache/struts2/components/Set.java
@@ -93,7 +93,11 @@ Object o; if (value == null) { - o = body; + if (body == null) { + o = findValue("top"); + } else { + o = body; + } } else { o = findValue(value); }
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java b/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java index a1b04e5..5817203 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
@@ -68,9 +68,13 @@ @Override protected String getBody() { if (trimBody) { - return super.getBody(); + if (bodyContent == null) { + return null; + } else { + return bodyContent.getString().trim(); + } } else { - return (bodyContent == null ? "" : bodyContent.getString()); + return (bodyContent == null ? null : bodyContent.getString()); } } }