Repository: struts Updated Branches: refs/heads/support-2-3 730441b7a -> 00c47b7ce
Reverts dropping name pre-evaluation Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e4ce3ce8 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e4ce3ce8 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e4ce3ce8 Branch: refs/heads/support-2-3 Commit: e4ce3ce839e606dd801fb71ac2f8072d7238981c Parents: 730441b Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Wed Jun 22 08:55:42 2016 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Wed Jun 22 08:55:42 2016 +0200 ---------------------------------------------------------------------- core/src/main/java/org/apache/struts2/components/UIBean.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/e4ce3ce8/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 9c973b3..5fd99a9 100644 --- a/core/src/main/java/org/apache/struts2/components/UIBean.java +++ b/core/src/main/java/org/apache/struts2/components/UIBean.java @@ -649,6 +649,7 @@ public abstract class UIBean extends Component { addParameter("themeExpansionToken", uiThemeExpansionToken); addParameter("expandTheme", uiThemeExpansionToken + theme); + String name = null; String providedLabel = null; if (this.key != null) { @@ -665,7 +666,8 @@ public abstract class UIBean extends Component { } if (this.name != null) { - addParameter("name", findString(this.name)); + name = findString(this.name); + addParameter("name", name); } if (label != null) {
