From 338c43af0c9463237057b6a535ea5cd5f3d99c11 Mon Sep 17 00:00:00 2001
From: Neil McErlean <neil.mcerlean@alfresco.com>
Date: Mon, 17 Jan 2011 08:41:30 +0000
Subject: [PATCH] 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
---
 .../java/org/alfresco/repo/rendition/RenditionServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/repo/rendition/RenditionServiceImpl.java b/source/java/org/alfresco/repo/rendition/RenditionServiceImpl.java
index 55c79a2a34..adbfe4af2f 100644
--- a/source/java/org/alfresco/repo/rendition/RenditionServiceImpl.java
+++ b/source/java/org/alfresco/repo/rendition/RenditionServiceImpl.java
@@ -274,7 +274,7 @@ public class RenditionServiceImpl implements RenditionService, RenditionDefiniti
      */
     public List<RenditionDefinition> loadRenditionDefinitions(String renditionEngineName)
     {
-        return this.loadRenditionDefinitions(renditionEngineName);
+        return this.renditionDefinitionPersister.loadRenditionDefinitions(renditionEngineName);
     }