[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - wsd/Storage.cpp

Michael Meeks (via logerrit) logerrit at kemper.freedesktop.org
Fri Nov 22 11:13:15 UTC 2019


 wsd/Storage.cpp |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 121773ca0ce25d1bed72de6c5269951e215b8a18
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu Nov 21 18:43:46 2019 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Nov 22 12:12:58 2019 +0100

    Log an error, and return failure on unhandled responses to save.
    
    Change-Id: Ib241a88e53a11276b3837f49ea6d964d706919a4
    Reviewed-on: https://gerrit.libreoffice.org/83429
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 30650814a..9b41c0798 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -958,6 +958,12 @@ StorageBase::SaveResult WopiStorage::saveLocalFileToStorage(const Authorization&
                 LOG_WRN("Invalid or missing JSON in " << wopiLog << " HTTP_CONFLICT response.");
             }
         }
+        else
+        {
+            LOG_ERR("Unexpected response to " << wopiLog << " : " << response.getStatus() <<
+                    "Cannot save file to WOPI storage uri [" << uriAnonym << "]. Error: ");
+            saveResult.setResult(StorageBase::SaveResult::FAILED);
+        }
     }
     catch (const Poco::Exception& pexc)
     {


More information about the Libreoffice-commits mailing list