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
This commit is contained in:
Dave Ward
2012-09-28 17:40:54 +00:00
parent 2380d18597
commit d40ec4e18c

View File

@@ -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)