From 66bbd743cfd566a469f47c4c3beeba6595f54f05 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu-Ghetu Date: Mon, 28 May 2018 23:53:59 +0300 Subject: [PATCH] RM-6337 Fix failing tests --- .../disposition/DispositionServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java index 52fd93cf04..86a67b2fb8 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java @@ -814,7 +814,6 @@ public class DispositionServiceImpl extends ServiceBaseImpl // Get the disposition instructions DispositionSchedule di = getDispositionSchedule(nodeRef); - NodeRef accessionNodeRef = di.getDispositionActionDefinitionByName("accession").getNodeRef(); DispositionAction nextDa = getNextDispositionAction(nodeRef); if (di != null && this.nodeService.hasAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE) && @@ -823,6 +822,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl Boolean combineSteps = null; if (nextDa.getName().equals("accession")) { + NodeRef accessionNodeRef = di.getDispositionActionDefinitionByName("accession").getNodeRef(); combineSteps = (Boolean)nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS); }