From 1adfba4868527beaac16d6dc3d2439c7cbb0e878 Mon Sep 17 00:00:00 2001
From: Tatyana Valkevych <tatyana.valkevych@alfresco.com>
Date: Wed, 21 Oct 2015 12:44:37 +0000
Subject: [PATCH] Merged V2.2 to V2.3    114900: Merged V2.2.1.x (2.2.1.3) to
 V2.2       114608: Merged DEV to V2.2.1.x          114604: MNT-14900 :
 Alfresco doesn't work with Records Management             - Fixed the
 circular reference problem from Spring config xml using
 NonBlockingLazyInitTargetSource

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@114902 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../module/org_alfresco_module_rm/rm-service-context.xml  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index 2343579896..f79173a8a2 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -392,8 +392,12 @@
         <property name="proxyInterfaces">
             <value>org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService</value>
         </property>
-        <property name="target">
-            <ref bean="filePlanService"/>
+        <property name="targetSource">
+            <bean class="org.alfresco.config.NonBlockingLazyInitTargetSource">
+                <property name="targetBeanName">
+                   <idref bean="filePlanService"/>
+                </property>
+            </bean>
         </property>
         <property name="interceptorNames">
             <list>