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

75088: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73976: Improvements to activities post events for ACE-1707


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75416 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-07-01 15:31:54 +00:00
parent 7546d20c6e
commit 24affa291e
5 changed files with 12 additions and 9 deletions

View File

@@ -309,17 +309,16 @@ public class GetMethod extends WebDAVMethod
}
}
protected void attemptReadContent(FileInfo realNodeInfo, ContentReader reader)
throws IOException
protected void attemptReadContent(FileInfo realNodeInfo, ContentReader reader) throws IOException
{
if (byteRanges != null && byteRanges.startsWith(RANGE_HEADER_UNIT_SPECIFIER))
{
m_davHelper.publishReadEvent(realNodeInfo, reader.getMimetype(), reader.getSize(), byteRanges.substring(6), reader.getEncoding());
HttpRangeProcessor rangeProcessor = new HttpRangeProcessor(getContentService());
String userAgent = m_request.getHeader(WebDAV.HEADER_USER_AGENT);
if (m_returnContent)
{
m_davHelper.publishReadEvent(realNodeInfo, reader.getMimetype(), reader.getSize(), byteRanges.substring(6), reader.getEncoding());
rangeProcessor.processRange(
m_response,
reader,