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

[Ashod Nakashian]

 loolwsd/LOOLWSD.cpp |   16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

New commits:
commit 724911f5228ca3d7967961a6a1a9d540acce2e95
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Apr 24 20:34:38 2016 -0400

    loolwsd: let the exception bubble up instead of assertion
    
    Change-Id: I471e017e486c2d7d7dcbf3cebd96d61eabfd54da
    Reviewed-on: https://gerrit.libreoffice.org/24356
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index a40edc8..675444e 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -927,6 +927,9 @@ public:
             Log::debug("Child socket for SessionId: " + sessionId + ", jailId: " + jailId +
                        ", docKey: " + docKey + " connected.");
 
+            // Jail id should be the PID, beacuse Admin need it to calculate the memory
+            const Poco::Process::PID pid = std::stoi(jailId);
+
             std::shared_ptr<DocumentBroker> docBroker;
             {
                 // This lock could become a bottleneck.
@@ -965,19 +968,6 @@ public:
             lock.unlock();
             AvailableChildSessionCV.notify_one();
 
-            const auto uri = request.getURI();
-
-            // Jail id should be the PID, beacuse Admin need it to calculate the memory
-            Poco::Process::PID pid;
-            try
-            {
-                pid = std::stoi(jailId);
-            }
-            catch (std::invalid_argument& exc)
-            {
-                assert(false);
-            }
-
             Log::info("Adding doc " + docKey + " to Admin");
             Admin::instance().addDoc(docKey, pid, docBroker->getFilename(), sessionId);