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

Henry Castro hcastro at collabora.com
Thu Nov 19 03:24:50 PST 2015


 loolwsd/LOOLSession.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 238e674ba965955d5578b7c01fc10763c9f07db4
Author: Henry Castro <hcastro at collabora.com>
Date:   Thu Nov 19 07:22:59 2015 -0400

    loolwsd: avoid double socket shutdown
    
    This cause abnormal socket close

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index ff0b316..9f64f81 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -186,8 +186,7 @@ MasterProcessSession::MasterProcessSession(std::shared_ptr<WebSocket> ws, Kind k
 MasterProcessSession::~MasterProcessSession()
 {
     std::cout << Util::logPrefix() << "MasterProcessSession dtor this=" << this << " _peer=" << _peer.lock().get() << std::endl;
-    if (_ws)
-        Util::shutdownWebSocket(*_ws);
+
     auto peer = _peer.lock();
     if (_kind == Kind::ToClient && peer)
     {


More information about the Libreoffice-commits mailing list