Merge from V3.4 to HEAD

r.24479 Merge from V3.3-BUG-FIX to V3.4
  r.24478 Merge from V3.3 to V3.3-BUG-FIX
  r.24477 Fix for ALF-6130. infinite recursion in RenditionServiceImpl.loadRenditionDefinitions(String) 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24866 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2011-01-17 08:41:30 +00:00
parent c294c6b4fe
commit 338c43af0c

View File

@@ -274,7 +274,7 @@ public class RenditionServiceImpl implements RenditionService, RenditionDefiniti
*/ */
public List<RenditionDefinition> loadRenditionDefinitions(String renditionEngineName) public List<RenditionDefinition> loadRenditionDefinitions(String renditionEngineName)
{ {
return this.loadRenditionDefinitions(renditionEngineName); return this.renditionDefinitionPersister.loadRenditionDefinitions(renditionEngineName);
} }