From d40ec4e18c0d70ed5269bedad70d4bd9e3d9c0cb Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Fri, 28 Sep 2012 17:40:54 +0000 Subject: [PATCH] Merged V4.1-BUG-FIX to HEAD 42167: (RECORD ONLY) ALF-16098 Remove activiti 5.7 jars, otherwise both versions are included in the war 42169: Merged V4.1 to V4.1-BUG-FIX 42168: ALF-16076: Corrected unfortunate typo breaking CMIS renditions including Web Quick Start in ALF-15158 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42170 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/repo/web/scripts/content/ContentGet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java b/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java index 0503c75e1a..4fd33d87ce 100644 --- a/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java +++ b/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java @@ -223,7 +223,7 @@ public class ContentGet extends StreamContent implements ServletContextAware } else { - streamContentLocal(req, res, reference.getNodeRef(), attach, ContentModel.PROP_CONTENT); + streamContentLocal(req, res, rendition.getNodeRef(), attach, ContentModel.PROP_CONTENT); } } catch(CMISFilterNotValidException e)