From c5ebe07269e42910aefc7c59d3c0c2ac0ca373cc Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 14 Mar 2014 15:25:18 +0000
Subject: [PATCH] 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
---
 source/java/org/alfresco/repo/webdav/WebDAVMethod.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/source/java/org/alfresco/repo/webdav/WebDAVMethod.java b/source/java/org/alfresco/repo/webdav/WebDAVMethod.java
index ce77192685..bd44570c2b 100644
--- a/source/java/org/alfresco/repo/webdav/WebDAVMethod.java
+++ b/source/java/org/alfresco/repo/webdav/WebDAVMethod.java
@@ -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);
     }