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

@@ -140,7 +140,7 @@ public class WebDAVHelper
/**
* @return Return the service registry
*/
public final ServiceRegistry getServiceRegistry()
public ServiceRegistry getServiceRegistry()
{
// TODO: eliminate this - not dependency injection!
return m_serviceRegistry;