[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-2' - loolwsd/LOOLSession.cpp

[Tor Lillqvist]

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

New commits:
commit aec0c5fdaa2d2e51c2f01a3b12d2c77375ec5898
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 d151a7f..30af0e3 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -607,6 +607,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;
@@ -623,6 +624,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;