Reverts call to addDefaultContext()

orphan-oss · Dec 30, 2024 · 45b3aaa · 45b3aaa
1 parent 7497d97
commit 45b3aaa
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/main/java/ognl/Ognl.java b/src/main/java/ognl/Ognl.java
@@ -398,22 +398,19 @@ public static Object getValue(Object tree, OgnlContext context, Object root) thr
      * @throws OgnlException                    if there is a pathological environmental problem
      */
     public static Object getValue(Object tree, OgnlContext context, Object root, Class<?> resultType) throws OgnlException {
-        if (context.getRoot() == null) {
-            context.setRoot(root);
-        }
-
         Object result;
+        OgnlContext ognlContext = addDefaultContext(root, context);
 
         Node node = (Node) tree;
 
         if (node.getAccessor() != null) {
-            result = node.getAccessor().get(context, root);
+            result = node.getAccessor().get(ognlContext, root);
         } else {
-            result = node.getValue(context, root);
+            result = node.getValue(ognlContext, root);
         }
 
         if (resultType != null) {
-            result = getTypeConverter(context).convertValue(context, root, null, null, result, resultType);
+            result = getTypeConverter(ognlContext).convertValue(ognlContext, root, null, null, result, resultType);
         }
         return result;
     }