inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix-2.5/MNT-20700_backportFix' into 'release/V2.5.3.x'

Browse Source 
Back-port fix from MNT-19967

See merge request records-management/records-management!1204
This commit is contained in:
Roxana Lucanu
2019-07-05 12:54:42 +01:00
parent f630a56e00 4de260d588
commit b1bb756913
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
View File

@@ -348,9 +348,6 @@ public class DispositionServiceImpl extends ServiceBaseImpl
return ds; return ds;
} }
/** /**
* This method returns a NodeRef * This method returns a NodeRef
* Gets the disposition instructions * Gets the disposition instructions
@@ -383,7 +380,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl
NodeRef result = getAssociatedDispositionScheduleImpl(parent); NodeRef result = getAssociatedDispositionScheduleImpl(parent);
if (result == null) if (result == null)
{ {
return null; return getOriginDispositionSchedule(parent);
} }
return new DispositionScheduleImpl(serviceRegistry, nodeService, result); return new DispositionScheduleImpl(serviceRegistry, nodeService, result);
} }