From e4ce3ce839e606dd801fb71ac2f8072d7238981c Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Wed, 22 Jun 2016 08:55:42 +0200
Subject: [PATCH] Reverts dropping name pre-evaluation

---
 core/src/main/java/org/apache/struts2/components/UIBean.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 9c973b38c..5fd99a9b8 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) {