[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - wsd/LOOLWSD.cpp

Ashod Nakashian ashod.nakashian at collabora.co.uk
Tue May 16 15:31:03 UTC 2017


 wsd/LOOLWSD.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d4b202fe4979832fe1f292735726f10b2b9f2330
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun May 7 23:23:02 2017 -0400

    wsd: build fix due to merge error
    
    Change-Id: Ib1d7ce1b880c71b0b2fd8262a92e7e965211653e
    Reviewed-on: https://gerrit.libreoffice.org/37375
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 5b3ac378..a889e42a 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1460,7 +1460,7 @@ private:
             if (jailId.empty())
             {
                 LOG_ERR("Invalid JailId in child URI [" << request.getURI() << "].");
-                return SocketHandlerInterface::SocketOwnership::UNCHANGED;
+                return;
             }
 
             in.clear();


More information about the Libreoffice-commits mailing list