From c4fb7ac119a5c408594088cceb86bfaf1ea3404a Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 26 Nov 2012 10:25:11 +0000
Subject: [PATCH] Fixed merge issue. Added recordService as a bean property.
 Missing service was causing a NullPointerException.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@43946 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../capability/rm-capabilities-condition-context.xml             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
index 20d9b80e9b..5934b792db 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
@@ -11,6 +11,7 @@
         <property name="permissionService" ref="PermissionService" />
         <property name="nodeService" ref="NodeService" />
         <property name="freezeService" ref="FreezeService" />
+        <property name="recordService" ref="recordService" />
     </bean>
     
     <bean id="capabilityCondition.frozen"