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

source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java

@@ -141,26 +141,25 @@ public class ResourceWebScriptPut extends AbstractResourceWebScript implements P
      * @return InputStream
      */
     private InputStream getStream(WebScriptRequest req)
+    {
+        try
         {
             if (req instanceof WebScriptServletRequest)
             {
                 WebScriptServletRequest servletRequest = (WebScriptServletRequest) req;
-            try
-            {
                 return servletRequest.getHttpServletRequest().getInputStream();
             }
+            else if (req instanceof WrappingWebScriptRequest)
+            {
+                // eg. BufferredRequest
+                WrappingWebScriptRequest wrappedRequest = (WrappingWebScriptRequest) req;
+                return wrappedRequest.getContent().getInputStream();
+            }
+        }
         catch (IOException error)
         {
             logger.warn("Failed to get the input stream.", error);
         }
-        }
-        else if (req instanceof WrappingWebScriptRequest)
-        {
-            // TODO review REST fwk change
-            // eg. BufferredRequest
-            WrappingWebScriptRequest wrappedRequest = (WrappingWebScriptRequest) req;
-            return wrappedRequest.getContent().getInputStream();
-        }
 
         return null;
     }