inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
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
This commit is contained in:
Ancuta Morarasu
2016-05-11 10:51:35 +00:00
parent 991c805e3b
commit 0dd010439c
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java
View File

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