From 0dd010439c289fc4074385f943ff2d98da508e20 Mon Sep 17 00:00:00 2001
From: Ancuta Morarasu <ancuta.morarasu@ness.com>
Date: Wed, 11 May 2016 10:51:35 +0000
Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1)    126375 jkaabimofrad:
 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)       119858 jvonka: RA-632:
 REST fwk - minor tweak to be consistent with existing exception handling

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../webscripts/ResourceWebScriptPut.java      | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java
index d90b0d6771..71f95ed452 100644
--- a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java
+++ b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java
@@ -142,24 +142,23 @@ public class ResourceWebScriptPut extends AbstractResourceWebScript implements P
      */
     private InputStream getStream(WebScriptRequest req)
     {
-        if (req instanceof WebScriptServletRequest)
+        try
         {
-            WebScriptServletRequest servletRequest = (WebScriptServletRequest) req;
-            try
+            if (req instanceof WebScriptServletRequest)
             {
+                WebScriptServletRequest servletRequest = (WebScriptServletRequest) req;
                 return servletRequest.getHttpServletRequest().getInputStream();
             }
-            catch (IOException error)
+            else if (req instanceof WrappingWebScriptRequest)
             {
-               logger.warn("Failed to get the input stream.", error);
+                // eg. BufferredRequest
+                WrappingWebScriptRequest wrappedRequest = (WrappingWebScriptRequest) req;
+                return wrappedRequest.getContent().getInputStream();
             }
         }
-        else if (req instanceof WrappingWebScriptRequest)
+        catch (IOException error)
         {
-            // TODO review REST fwk change
-            // eg. BufferredRequest
-            WrappingWebScriptRequest wrappedRequest = (WrappingWebScriptRequest) req;
-            return wrappedRequest.getContent().getInputStream();
+            logger.warn("Failed to get the input stream.", error);
         }
 
         return null;