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

[Giuseppe Castagno]

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

New commits:
commit 8ff5e67dea29d9ceb100a67a69f6deb4c6f18e13
Author: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Date:   Thu Aug 11 14:19:03 2016 +0200

    tdf#101094 (22): Simplify cache removal: MKCOL, PUT
    
    Change-Id: Id2c9f87e408b6754e17ef3792691d848deabfcd5
    Reviewed-on: https://gerrit.libreoffice.org/28056
    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 e5cd7e4..ca4531d 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -2472,23 +2472,21 @@ void Content::insert(
 
         aURL += aEscapedTitle;
 
-        // save the URL to clean cache
-        OUString    aTargetUrl = aURL;
         try
         {
             xResAccess->setURL( aURL );
 
             if ( bCollection )
             {
+                aStaticDAVOptionsCache.removeDAVOptions( xResAccess->getURL() );
                 xResAccess->MKCOL( Environment );
-                aStaticDAVOptionsCache.removeDAVOptions( aTargetUrl );
             }
             else
             {
-                xResAccess->PUT( xInputStream, Environment );
                 // remove options from cache, PUT may change it
                 // it will be refreshed when needed
-                aStaticDAVOptionsCache.removeDAVOptions( aTargetUrl );
+                aStaticDAVOptionsCache.removeDAVOptions( xResAccess->getURL() );
+                xResAccess->PUT( xInputStream, Environment );
             }
             // no error , set the resourcetype to unknown type
             // the resource may have transitioned from NOT FOUND or UNKNOWN to something else
@@ -2499,7 +2497,6 @@ void Content::insert(
         }
         catch ( DAVException const & except )
         {
-            aStaticDAVOptionsCache.removeDAVOptions( aTargetUrl );
             if ( bCollection )
             {
                 if ( except.getStatus() == SC_METHOD_NOT_ALLOWED )