This is an automated email from the ASF dual-hosted git repository.

kusal pushed a commit to branch WW-5349-astvarref
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 4155263e6323d2fad716624c43e0c7b0f126d1a3
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Mon Oct 9 15:48:07 2023 +1100

    WW-5349 Remove Struts core dependency on OGNL VarRefs
---
 core/src/main/java/org/apache/struts2/components/UIBean.java | 12 ------------
 1 file changed, 12 deletions(-)

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 9dc4807f3..59d3713ed 100644
--- a/core/src/main/java/org/apache/struts2/components/UIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/UIBean.java
@@ -601,12 +601,6 @@ public abstract class UIBean extends Component {
             result = findString(this.templateDir);
         }
 
-        // If templateDir is not explicitly given,
-        // try to find attribute which states the dir set to use
-        if (StringUtils.isBlank(result)) {
-            result = stack.findString("#attr.templateDir");
-        }
-
         // Default template set
         if (StringUtils.isBlank(result)) {
             result = defaultTemplateDir;
@@ -634,12 +628,6 @@ public abstract class UIBean extends Component {
             }
         }
 
-        // If theme set is not explicitly given,
-        // try to find attribute which states the theme set to use
-        if (StringUtils.isBlank(result)) {
-            result = stack.findString("#attr.theme");
-        }
-
         // Default theme set
         if (StringUtils.isBlank(result)) {
             result = defaultUITheme;

Reply via email to