From 82046a2f0fe2f6316522938b7c6f8246a7692d30 Mon Sep 17 00:00:00 2001
From: cagache <claudia.agache@ness.com>
Date: Thu, 27 Sep 2018 12:40:04 +0300
Subject: [PATCH] Back-port fix from MNT-19967

(cherry picked from commit 4de260d588e641b257f2bf89fa89ec9fd3c5753b)
---
 .../disposition/DispositionServiceImpl.java                  | 5 +----
 1 file changed, 1 insertion(+), 4 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 d3cd3cb49d..32f68c1bb5 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
@@ -348,9 +348,6 @@ public class DispositionServiceImpl extends    ServiceBaseImpl
         return ds;
     }
 
-
-
-
     /**
      * This method returns a NodeRef
      * Gets the disposition instructions
@@ -383,7 +380,7 @@ public class DispositionServiceImpl extends    ServiceBaseImpl
                 NodeRef result = getAssociatedDispositionScheduleImpl(parent);
                 if (result == null)
                 {
-                    return null;
+                    return getOriginDispositionSchedule(parent);
                 }
                 return new DispositionScheduleImpl(serviceRegistry, nodeService, result);
             }