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

[Ashod Nakashian]

 loolwsd/ChildProcessSession.cpp |    7 +------
 loolwsd/LOOLKit.cpp             |    1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 910b34de58acf28eaf043a7647d84750a08fad0c
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sat Jan 9 12:02:52 2016 -0500

    loolwsd: destroy ChildProcessSessions
    
    Change-Id: I58e9f58047162e842e155b70284fe55a45af35c9
    Reviewed-on: https://gerrit.libreoffice.org/21324
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index 0940509..b2cc4c3 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -66,12 +66,7 @@ ChildProcessSession::~ChildProcessSession()
 
     Poco::Mutex::ScopedLock lock(_mutex);
 
-    if (_loKitDocument != nullptr)
-    {
-        _onUnload(_viewId);
-        Log::debug("Destroy view [" + getName() + "]-> [" + std::to_string(_viewId) + "]");
-    }
-
+    _onUnload(_viewId);
 }
 
 bool ChildProcessSession::_handleInput(const char *buffer, int length)
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 1564616..7c9f86e 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -438,6 +438,7 @@ public:
 
             // We should probably send the Client some sensible message and reason.
             _session->sendTextFrame("eof");
+            _session.reset();
         }
         catch (const Exception& exc)
         {