From 1ece45f8344b79ca2da3f9eadd321024f711b664 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu-Ghetu Date: Wed, 30 May 2018 09:38:25 +0300 Subject: [PATCH] RM-6337 Code review changes --- .../disposition/DispositionServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 c9d33dd7f9..abe1efba5f 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 @@ -824,9 +824,10 @@ public class DispositionServiceImpl extends ServiceBaseImpl { NodeRef accessionNodeRef = di.getDispositionActionDefinitionByName("accession").getNodeRef(); if (accessionNodeRef != null) { - if (this.nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS) != null) + Boolean combineStepsProp = (Boolean)this.nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS); + if (combineStepsProp != null) { - combineSteps = (Boolean)this.nodeService.getProperty(accessionNodeRef, PROP_COMBINE_DISPOSITION_STEP_CONDITIONS); + combineSteps = combineStepsProp; } } } @@ -834,7 +835,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl Boolean asOfDateInPast = false; if (asOf != null) { - asOfDateInPast = ((Date) this.nodeService.getProperty(nextDa.getNodeRef(), PROP_DISPOSITION_AS_OF)).before(new Date()); + asOfDateInPast = asOf.before(new Date()); } if (asOfDateInPast && !combineSteps) {