(struts) 03/03: WW-5382 Fix stale bootstrap context on ActionContext

[kusal]

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

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

commit 2024d831772a8ce19cd915671a7d570762135ec9
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Sun Dec 31 00:30:15 2023 +1100

    WW-5382 Fix stale bootstrap context on ActionContext
---
 .../com/opensymphony/xwork2/config/impl/DefaultConfiguration.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git 
a/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
 
b/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
index 4a6ee1373..3c60af76c 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
@@ -325,12 +325,8 @@ public class DefaultConfiguration implements Configuration 
{
     }
 
     protected ActionContext setContext(Container cont) {
-        ActionContext context = ActionContext.getContext();
-        if (context == null) {
-            ValueStack vs = 
cont.getInstance(ValueStackFactory.class).createValueStack();
-            context = ActionContext.of(vs.getContext()).bind();
-        }
-        return context;
+        ValueStack vs = 
cont.getInstance(ValueStackFactory.class).createValueStack();
+        return ActionContext.of(vs.getContext()).bind();
     }
 
     protected Container createBootstrapContainer(List<ContainerProvider> 
providers) {