From 5690ddd7cc2f48ac616c87239ce5c9909d4555c2 Mon Sep 17 00:00:00 2001
From: Ancuta Morarasu <ancuta.morarasu@ness.com>
Date: Wed, 11 May 2016 11:37:42 +0000
Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1)    126480 jkaabimofrad:
 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/BRANCHES/DEV/5.2.N/root@126824 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 0114e33d69..986dda1a37 100644
--- a/source/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java
+++ b/source/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java
@@ -163,6 +163,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);