From 63ab83632cf70608adb5340cf887ab67e4e56c2c Mon Sep 17 00:00:00 2001 From: Kusal Kithul-Godage Date: Wed, 29 Mar 2023 11:31:43 +1100 Subject: [PATCH] WW-5300 Make Dispatcher methods overridable --- .../main/java/org/apache/struts2/dispatcher/Dispatcher.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java index ce6dbe673..74780a15a 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java @@ -657,7 +657,7 @@ public class Dispatcher { } } - private ActionProxy prepareActionProxy(Map extraContext, String actionNamespace, String actionName, String actionMethod) { + protected ActionProxy prepareActionProxy(Map extraContext, String actionNamespace, String actionName, String actionMethod) { ActionProxy proxy; //check if we are probably in an async resuming ActionInvocation invocation = ActionContext.getContext().getActionInvocation(); @@ -676,12 +676,12 @@ public class Dispatcher { return proxy; } - private ActionProxy createActionProxy(String namespace, String name, String method, Map extraContext) { + protected ActionProxy createActionProxy(String namespace, String name, String method, Map extraContext) { ActionProxyFactory actionProxyFactory = getContainer().getInstance(ActionProxyFactory.class); return actionProxyFactory.createActionProxy(namespace, name, method, extraContext, true, false); } - private boolean isSameAction(ActionProxy actionProxy, String namespace, String actionName, String method) { + protected boolean isSameAction(ActionProxy actionProxy, String namespace, String actionName, String method) { return Objects.equals(namespace, actionProxy.getNamespace()) && Objects.equals(actionName, actionProxy.getActionName()) && Objects.equals(method, actionProxy.getMethod());