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

[Ashod Nakashian]

 loolwsd/LOOLWSD.cpp |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 378ce7544a917a0b57663b9d1dd926f53c967efe
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon May 9 23:42:09 2016 -0400

    loolwsd: try to recover when a client doesn't go away while connecting another
    
    Change-Id: Id585bfe53c6b60cc7de7fa271739d43876d6e832
    Reviewed-on: https://gerrit.libreoffice.org/24815
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 787cb7a..adb4140 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -561,9 +561,8 @@ private:
 
                 if (docBroker)
                 {
-                    // Still here, but marked to destroy.
-                    Log::error("Timed out while waiting for document to unload before loading. Service Unavailable.");
-                    throw WebSocketErrorMessageException(SERVICE_UNAVALABLE_INTERNAL_ERROR);
+                    // Still here, but marked to destroy. Proceed and hope to recover.
+                    Log::error("Timed out while waiting for document to unload before loading.");
                 }
             }
         }