[struts] branch feature/WW-5338-remove-ognltool updated: WW-5338 Removes also deprecated constant in ContextUtil

[lukaszlenart]

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

lukaszlenart pushed a commit to branch feature/WW-5338-remove-ognltool
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to 
refs/heads/feature/WW-5338-remove-ognltool by this push:
     new b31637984 WW-5338 Removes also deprecated constant in ContextUtil
b31637984 is described below

commit b31637984019fff95c15febe9e5393f9930c6540
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Wed Oct 4 13:22:56 2023 +0200

    WW-5338 Removes also deprecated constant in ContextUtil
---
 core/src/main/java/org/apache/struts2/util/StrutsUtil.java        | 2 +-
 core/src/main/java/org/apache/struts2/views/util/ContextUtil.java | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/src/main/java/org/apache/struts2/util/StrutsUtil.java 
b/core/src/main/java/org/apache/struts2/util/StrutsUtil.java
index 13c574fbd..c693599e7 100644
--- a/core/src/main/java/org/apache/struts2/util/StrutsUtil.java
+++ b/core/src/main/java/org/apache/struts2/util/StrutsUtil.java
@@ -119,8 +119,8 @@ public class StrutsUtil {
     }
 
     public Object findValue(String expr, Object context) {
+        stack.push(context);
         try {
-            stack.push(context);
             return stack.findValue(expr, true);
         } finally {
             stack.pop();
diff --git a/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java 
b/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java
index 97c148f37..4ab3c2786 100644
--- a/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java
+++ b/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java
@@ -36,7 +36,6 @@ public class ContextUtil {
     public static final String SESSION = "session";
     public static final String BASE = "base";
     public static final String STACK = "stack";
-    public static final String OGNL = "ognl";
     public static final String STRUTS = "struts";
     public static final String ACTION = "action";
 
@@ -49,7 +48,6 @@ public class ContextUtil {
         map.put(STACK, stack);
         StrutsUtil util = new StrutsUtil(stack, req, res);
         map.put(STRUTS, util);
-        map.put(OGNL, util); // Deprecated since 6.3.0
 
         ActionInvocation invocation = 
stack.getActionContext().getActionInvocation();
         if (invocation != null) {