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

Tor Lillqvist tml at collabora.com
Thu Jul 2 06:26:40 PDT 2015


 loolwsd/LOOLSession.cpp |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f4da368a52a842e9224c58fa0953eddbf6b037a1
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jul 2 16:26:09 2015 +0300

    Add a FIXME, found by looking, no time to investigate

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index a568569..df0a698 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -613,6 +613,7 @@ void MasterProcessSession::dispatchChild()
             sendTextFrame("error: cmd=load kind=internal");
 
             // We did not use the child session after all
+            // FIXME: Why do we do the same thing both here and then when we catch the IOException that we throw, a dozen line below?
             lock.lock();
             _availableChildSessions.insert(childSession);
             std::cout << Util::logPrefix() << "_availableChildSessions size=" << _availableChildSessions.size() << std::endl;
@@ -629,6 +630,7 @@ void MasterProcessSession::dispatchChild()
         Application::instance().logger().error(Util::logPrefix() + "Copying failed: " + exc.message());
         sendTextFrame("error: cmd=load kind=failed");
 
+        // FIXME: See above FIXME
         lock.lock();
         _availableChildSessions.insert(childSession);
         std::cout << Util::logPrefix() << "_availableChildSessions size=" << _availableChildSessions.size() << std::endl;


More information about the Libreoffice-commits mailing list