Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

57702: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57699: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57698: MNT-9770: WebDAV uploads over 2gb in size fails.
            - Handle null header content length (failed a test when merged to 4.2-BUG-FIX)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61870 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 21:26:05 +00:00
parent 2d53704b85
commit eb7349094a

View File

@@ -289,7 +289,15 @@ public abstract class WebDAVMethod
long bytes = streamCopier.copyStreamsLong(req.getInputStream(), new FileOutputStream(this.m_requestBody), m_davHelper.getSizeLimit());
// get content length
long contentLength = Long.valueOf(req.getHeader(WebDAV.HEADER_CONTENT_LENGTH));
long contentLength = -1;
try
{
contentLength = Long.valueOf(req.getHeader(WebDAV.HEADER_CONTENT_LENGTH));
}
catch (NumberFormatException e)
{
; // may be null etc.
}
// ALF-7377: check for corrupt request
if (contentLength >= 0 && contentLength != bytes)