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

[Giuseppe Castagno]

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

New commits:
commit 63af1c52c534840d1f55e3041351d24b85edcaa4
Author: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Date:   Sun Aug 14 13:18:44 2016 +0200

    tdf#101094 (23): Simplify cache removal: MOVE, COPY
    
    Change-Id: Ia9ef644359c34ac30b78d48c79e8bc9d5c639f92
    Reviewed-on: https://gerrit.libreoffice.org/28111
    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 9cada12..55cbd83 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -2168,7 +2168,7 @@ uno::Any Content::open(
                                     ucb::IOErrorCode_NOT_EXISTING,
                                     aArgs ) ),
                             xEnv );
-                // Unreachable
+                        // Unreachable
                     }
                 }
                 catch ( DAVException const & e )
@@ -2746,13 +2746,13 @@ void Content::transfer(
             // destination resource.  If the Overwrite header is set to
             // "F" then the operation will fail.
 
+            aStaticDAVOptionsCache.removeDAVOptions( sourceURI.GetURI() );
+            aStaticDAVOptionsCache.removeDAVOptions( targetURI.GetURI() );
             aSourceAccess.MOVE( sourceURI.GetPath(),
                                 targetURI.GetURI(),
                                 rArgs.NameClash
                                     == ucb::NameClash::OVERWRITE,
                                 Environment );
-            aStaticDAVOptionsCache.removeDAVOptions( sourceURI.GetURI() );
-            aStaticDAVOptionsCache.removeDAVOptions( targetURI.GetURI() );
 
             if ( xSource.is() )
             {
@@ -2775,13 +2775,13 @@ void Content::transfer(
             // destination resource.  If the Overwrite header is set to
             // "F" then the operation will fail.
 
+            aStaticDAVOptionsCache.removeDAVOptions( sourceURI.GetURI() );
+            aStaticDAVOptionsCache.removeDAVOptions( targetURI.GetURI() );
             aSourceAccess.COPY( sourceURI.GetPath(),
                                 targetURI.GetURI(),
                                 rArgs.NameClash
                                     == ucb::NameClash::OVERWRITE,
                                 Environment );
-            aStaticDAVOptionsCache.removeDAVOptions( sourceURI.GetURI() );
-            aStaticDAVOptionsCache.removeDAVOptions( targetURI.GetURI() );
 
 // DAV resources store all additional props on server!
 //              // Copy own and all children's Additional Core Properties.
@@ -2801,14 +2801,10 @@ void Content::transfer(
     }
     catch ( ucb::IllegalIdentifierException const & )
     {
-        aStaticDAVOptionsCache.removeDAVOptions( sourceURI.GetURI() );
-        aStaticDAVOptionsCache.removeDAVOptions( targetURI.GetURI() );
         // queryContent
     }
     catch ( DAVException const & e )
     {
-        aStaticDAVOptionsCache.removeDAVOptions( sourceURI.GetURI() );
-        aStaticDAVOptionsCache.removeDAVOptions( targetURI.GetURI() );
         // [RFC 2518] - WebDAV
         // 412 (Precondition Failed) - The server was unable to maintain
         // the liveness of the properties listed in the propertybehavior