[Libreoffice-commits] core.git: ucb/source

[Giuseppe Castagno]

 ucb/source/ucp/webdav-neon/webdavcontent.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit fd586445a47d50ebfff67a7d5e4a329cf064cb92
Author: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Date:   Thu Jan 14 18:11:28 2016 +0100

    tdf#101094 (7) OPTIONS: Remove resourceTypeForLocks before unlock
    
    Not needed, unlock() checks if a lock is present first.
    If present, it means that LOCK is available, inferring the presence of
    UNLOCK availability.
    
    Change-Id: I007c4b02b27e8a40f15721c0308c894ad6f482fd
    Reviewed-on: https://gerrit.libreoffice.org/27660
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>

diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 60e91be..f91a50c 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -614,8 +614,9 @@ uno::Any SAL_CALL Content::execute(
     {
 
         // unlock
-        if ( resourceTypeForLocks( Environment ) == DAV )
-            unlock( Environment );
+        // do not check for a DAV resource
+        // the lock store will be checked before sending
+        unlock( Environment );
     }
     else if ( aCommand.Name == "createNewContent" && isFolder( Environment ) )
     {