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

[Giuseppe Castagno]

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

New commits:
commit e0eb85785b68867f1476553723dbfc6dc407106b
Author: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Date:   Mon Jan 11 11:11:19 2016 +0100

    tdf#101094 (14) OPTIONS: Options cache removal: PUT
    
    Change-Id: I251bbb101b4be851deaab66cbe4e10ff1fa3376e
    Reviewed-on: https://gerrit.libreoffice.org/27691
    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 81c015c..67d21ab 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -2422,6 +2422,8 @@ void Content::insert(
 
         aURL += aEscapedTitle;
 
+        // save the URL to clean cache
+        OUString    aTargetUrl = aURL;
         try
         {
             xResAccess->setURL( aURL );
@@ -2431,6 +2433,9 @@ void Content::insert(
             else
             {
                 xResAccess->PUT( xInputStream, Environment );
+                // remove options from cache, PUT may change it
+                // it will be refreshed when needed
+                aStaticDAVOptionsCache.removeDAVOptions( aTargetUrl );
             }
             // no error , set the resourcetype to unknown type
             // the resource may have transitioned from NOT FOUND or UNKNOWN to something else
@@ -2441,6 +2446,7 @@ void Content::insert(
         }
         catch ( DAVException const & except )
         {
+            aStaticDAVOptionsCache.removeDAVOptions( aTargetUrl );
             if ( bCollection )
             {
                 if ( except.getStatus() == SC_METHOD_NOT_ALLOWED )
@@ -2528,12 +2534,18 @@ void Content::insert(
             // Unreachable
         }
 
+        // save the URL since it may change due to redirection
+        OUString    aTargetUrl = xResAccess->getURL();
         try
         {
             xResAccess->PUT( xInputStream, Environment );
+            // remove options from cache, PUT may change it
+            // it will be refreshed when needed
+            aStaticDAVOptionsCache.removeDAVOptions( aTargetUrl );
         }
         catch ( DAVException const & e )
         {
+            aStaticDAVOptionsCache.removeDAVOptions( aTargetUrl );
             cancelCommandExecution( e, Environment, true );
             // Unreachable
         }