Merged HEAD-BUG-FIX to HEAD (4.2)

55023: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
      54717: Merged BRANCHES/DEV/mward/HEAD-ALF-19833 to BRANCHES/DEV/V4.1-BUG-FIX:
         54716: MNT-8989: MP4 and mov accessed over WebDav on safari or Chrome cause exceptions in log


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55082 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2013-09-08 07:40:13 +00:00
parent b7a5be7b6d
commit 1d6f2f7efd
3 changed files with 191 additions and 3 deletions

View File

@@ -36,7 +36,6 @@ import org.alfresco.repo.web.util.HttpRangeProcessor;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.model.FileNotFoundException;
import org.alfresco.service.cmr.repository.ContentIOException;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.MimetypeService;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -269,7 +268,7 @@ public class GetMethod extends WebDAVMethod
{
attemptReadContent(realNodeInfo, reader);
}
catch (ContentIOException e)
catch (final Throwable e)
{
boolean logAsError = true;
Throwable t = e;