loolwsd/LOOLWSD.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 71b7b68f6a32484c3be50fc99179daa0a3c09e4c
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Thu May 12 10:37:54 2016 -0400
loolwsd: correct error report while loading
Change-Id: I4e5e4dd1318144255294011c70c6d2bbfd74c1d8
Reviewed-on: https://gerrit.libreoffice.org/24932
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
(cherry picked from commit 9376156ac34de6c28455ef1c14a65dcd0230ba83)
Reviewed-on: https://gerrit.libreoffice.org/25384
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 6a726de..f2b47ad 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -590,8 +590,9 @@ private:
// Remove.
std::unique_lock<std::mutex> lock(docBrokersMutex);
docBrokers.erase(docKey);
- throw
WebSocketErrorMessageException(SERVICE_UNAVALABLE_INTERNAL_ERROR);
}
+
+ throw
WebSocketErrorMessageException(SERVICE_UNAVALABLE_INTERNAL_ERROR);
}
// Validate the URI and Storage before moving on.
@@ -820,7 +821,7 @@ public:
const std::string msg = std::string("error: ") +
exc.what();
ws->sendFrame(msg.data(), msg.size());
// abnormal close frame handshake
- ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY,
exc.what());
+ ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, msg);
}
catch (const std::exception& exc2)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
