Repository: struts Updated Branches: refs/heads/support-2-3 3f526d630 -> 88b885339
Drops pre-evaluation of name Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/88b88533 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/88b88533 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/88b88533 Branch: refs/heads/support-2-3 Commit: 88b885339a6cb7e31393cbb723a57ddf8f8b4494 Parents: 3f526d6 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Thu Jun 2 16:57:44 2016 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Thu Jun 2 16:57:44 2016 +0200 ---------------------------------------------------------------------- core/src/main/java/org/apache/struts2/components/UIBean.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/88b88533/core/src/main/java/org/apache/struts2/components/UIBean.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java index 5fd99a9..9c973b3 100644 --- a/core/src/main/java/org/apache/struts2/components/UIBean.java +++ b/core/src/main/java/org/apache/struts2/components/UIBean.java @@ -649,7 +649,6 @@ public abstract class UIBean extends Component { addParameter("themeExpansionToken", uiThemeExpansionToken); addParameter("expandTheme", uiThemeExpansionToken + theme); - String name = null; String providedLabel = null; if (this.key != null) { @@ -666,8 +665,7 @@ public abstract class UIBean extends Component { } if (this.name != null) { - name = findString(this.name); - addParameter("name", name); + addParameter("name", findString(this.name)); } if (label != null) {
