inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/Merge_MNT-19967_From2.6

Browse Source
This commit is contained in:
cagache
2018-10-03 10:10:12 +03:00
parent d026355bb4 3dedf274f2
commit af42247487
4 changed files with 348 additions and 6 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;
}
/**
* 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);
}