From 573dbbcea87fe0d60378d1f588531389bf595bcd Mon Sep 17 00:00:00 2001
From: Kusal Kithul-Godage <git@kusal.io>
Date: Wed, 3 Jan 2024 21:41:37 +1100
Subject: [PATCH] WW-5381 Revert bean removal for backwards compatibility

---
 core/src/main/resources/struts-beans.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/main/resources/struts-beans.xml b/core/src/main/resources/struts-beans.xml
index 3343b6386..ddc2de7ca 100644
--- a/core/src/main/resources/struts-beans.xml
+++ b/core/src/main/resources/struts-beans.xml
@@ -201,6 +201,11 @@
     <bean type="ognl.MethodAccessor" name="struts"
           class="com.opensymphony.xwork2.ognl.accessor.XWorkMethodAccessor"/>
 
+    <!-- DEPRECATED since 6.4.0 - Retained for backwards compatibility with custom beans
+            that may expect it to be present. Inject the DEFAULT bean of 'ognl.MethodAccessor' above instead.  -->
+    <bean type="ognl.MethodAccessor" name="java.lang.Object"
+          class="com.opensymphony.xwork2.ognl.accessor.XWorkMethodAccessor"/>
+
     <bean type="org.apache.struts2.dispatcher.StaticContentLoader"
           class="org.apache.struts2.dispatcher.DefaultStaticContentLoader" name="struts"/>
     <bean type="com.opensymphony.xwork2.UnknownHandlerManager"