From de6c8d5ed9b5089b97a7982650d076ee11d87c5a Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Thu, 14 Jun 2018 08:27:55 +0300
Subject: [PATCH] rename the extended bean simpleMappingExceptionResolverParent
 (core change)

(cherry picked from commit 2f3211c979ab423a6cf074d93283b3a47fac354f)
---
 .../module/org_alfresco_module_rm/rm-public-rest-context.xml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-rest-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-rest-context.xml
index 8d16ade1a0..1dee4ef341 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-rest-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-rest-context.xml
@@ -202,7 +202,7 @@
    </bean>
 
    <!-- Map RM exceptions to HTML status codes -->
-   <bean id="rm.simpleMappingExceptionResolver" abstract="true" parent="simpleMappingExceptionResolver">
+   <bean id="rm.simpleMappingExceptionResolver" abstract="true" parent="simpleMappingExceptionResolverParent">
        <property name="exceptionMappings">
             <map merge="true">
                 <entry key="org.alfresco.service.cmr.attributes.DuplicateAttributeException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_CONFLICT}" />
@@ -212,7 +212,7 @@
         </property>
    </bean>
    <bean class="org.alfresco.util.BeanExtender">
-      <property name="beanName" value="simpleMappingExceptionResolver"/>
+      <property name="beanName" value="simpleMappingExceptionResolverParent"/>
       <property name="extendingBeanName" value="rm.simpleMappingExceptionResolver"/>
     </bean>
 </beans>
\ No newline at end of file