[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon May 27 22:17:21 UTC 2019


 wsd/LOOLWSD.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6ad5f3a50984f68c40f4d0282447f979e95ee840
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Mon May 27 22:22:13 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon May 27 23:16:47 2019 +0100

    re-order to fix threading; probable mis-merge.
    
    Change-Id: Id59042248db7572add2d06f62cd8f1d4969ed889

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 8e43fe313..28c91dbdf 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2451,7 +2451,10 @@ private:
                     sent = true;
                 }
                 else
+                {
                     LOG_WRN("Failed to create Client Session with id [" << _id << "] on docKey [" << docKey << "].");
+                    cleanupDocBrokers();
+                }
             }
 
             if (!sent)
@@ -2706,7 +2709,6 @@ private:
                 else
                 {
                     LOG_WRN("Failed to create Client Session with id [" << _id << "] on docKey [" << docKey << "].");
-                    cleanupDocBrokers();
                 }
             }
             else


More information about the Libreoffice-commits mailing list