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

63058: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62625:  Merged DEV to V4.2-BUG-FIX (4.2.2)
         61010: MNT-10555: Sometimes, documents are locked by Office but not locked by Alfresco
           - Give access to WebDAV operation, when a lock has expired.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64245 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-03-14 15:25:18 +00:00
parent 3ac5243c9d
commit c5ebe07269

View File

@@ -1140,6 +1140,12 @@ public abstract class WebDAVMethod
throw new WebDAVServerException(WebDAV.WEBDAV_SC_LOCKED);
}
}
// MNT-10555
if (lockInfo.isExpired())
{
return;
}
throw new WebDAVServerException(WebDAV.WEBDAV_SC_LOCKED);
}