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

[Giuseppe Castagno]

 ucb/source/ucp/webdav-neon/webdavcontent.cxx |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

New commits:
commit d14977d33bc3edb6a2c41db4d685d099bfe8d51e
Author: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Date:   Wed Aug 3 19:42:27 2016 +0200

    tdf#101094 (20) OPTIONS: Check for Class1 DAV before unlock
    
    Change-Id: I890a44bb98577de006355d8394d46baeeaadb13f
    Reviewed-on: https://gerrit.libreoffice.org/27837
    Tested-by: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
    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 1464281..d86286b 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -3260,10 +3260,18 @@ void Content::unlock(
 
         // update the URL
         aTargetUrl = xResAccess->getURL();
-        xResAccess->UNLOCK( Environment );
-        // remove options from cache, unlock may change it
-        // it will be refreshed when needed
-        aStaticDAVOptionsCache.removeDAVOptions( aTargetUrl );
+        // check if the target URL is a Class1 DAV
+        DAVOptions aDAVOptions;
+        getResourceOptions( Environment, aDAVOptions, xResAccess );
+
+        // at least class one is needed
+        if( aDAVOptions.isClass1() )
+        {
+            xResAccess->UNLOCK( Environment );
+            // remove options from cache, unlock may change it
+            // it will be refreshed when needed
+            aStaticDAVOptionsCache.removeDAVOptions( aTargetUrl );
+        }
 
         {
             osl::Guard< osl::Mutex > aGuard( m_aMutex );