From 7ae93de90a0191ae4ff9cd7e1f0d1b2ba1f748c3 Mon Sep 17 00:00:00 2001
From: Jamal Kaabi-Mofrad <Jamal.kaabimofrad@alfresco.com>
Date: Tue, 10 May 2016 11:08:58 +0000
Subject: [PATCH] Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)    122568
 gjames: RA-211: Re-enabling binaryresource without post-processing

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126480 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../rest/framework/webscripts/AbstractResourceWebScript.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java b/source/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java
index 6720151773..03ab3ad6e2 100644
--- a/source/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java
+++ b/source/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java
@@ -156,6 +156,10 @@ public abstract class AbstractResourceWebScript extends ApiWebScript implements
                         final ResourceOperation operation = resource.getMetaData().getOperation(getHttpMethod());
                         Object result = executeAction(resource, params);
                         setResponse(res,operation.getSuccessStatus(),ApiWebScript.CACHE_NEVER, DEFAULT_JSON_CONTENT);
+                        if (result instanceof BinaryResource)
+                        {
+                            return result; //don't postprocess it.
+                        }
                         return helper.processAdditionsToTheResponse(res, resource.getMetaData().getApi(), entityCollectionName, params, result);
                     }
                 }, isReadOnly, true);