webdav: Do not call into DAVResourceAccess with mutex locked.

This commit cherry-picks 0c350011
for serf webdav version.

Change-Id: I108b0068cad847bf4947ece5e690f789ef034ae9

ucb/source/ucp/webdav/webdavcontent.cxx

@@ -1472,8 +1472,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                     }
                     catch ( DAVException const & e )
                     {
-                        bNetworkAccessAllowed
-                            = shouldAccessNetworkAfterException( e );
+                        bNetworkAccessAllowed = bNetworkAccessAllowed &&
+                            shouldAccessNetworkAfterException( e );
 
                         if ( !bNetworkAccessAllowed )
                         {
@@ -3329,9 +3329,12 @@ const Content::ResourceType & Content::getResourceType(
                     bool * networkAccessAllowed )
     throw ( uno::Exception )
 {
-    if ( m_eResourceType == UNKNOWN )
     {
-        osl::Guard< osl::Mutex > aGuard( m_aMutex );
+        osl::MutexGuard g(m_aMutex);
+        if (m_eResourceType != UNKNOWN) {
+            return m_eResourceType;
+        }
+    }
 
     ResourceType eResourceType = UNKNOWN;
 
@@ -3358,6 +3361,7 @@ const Content::ResourceType & Content::getResourceType(
         // TODO - is this really only one?
         if ( resources.size() == 1 )
         {
+            osl::MutexGuard g(m_aMutex);
             m_xCachedProps.reset(
                 new CachableContentProperties( resources[ 0 ] ) );
             m_xCachedProps->containsAllNames(
@@ -3388,7 +3392,15 @@ const Content::ResourceType & Content::getResourceType(
             cancelCommandExecution( e, uno::Reference< ucb::XCommandEnvironment >() );
         }
     }
+
+    osl::MutexGuard g(m_aMutex);
+    if (m_eResourceType == UNKNOWN) {
         m_eResourceType = eResourceType;
+    } else {
+        SAL_WARN_IF(
+            eResourceType != m_eResourceType, "ucb.ucp.webdav",
+            "different resource types for <" << rResAccess->getURL() << ">: "
+            << +eResourceType << " vs. " << +m_eResourceType);
     }
     return m_eResourceType;
 }