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

[Ashod Nakashian]

 wsd/LOOLWSD.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aebfccd2ca06c9a8c2b474188846dd19fe740ba9
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Jan 1 20:28:07 2017 -0500

    wsd: force forking children when none is outstanding
    
    Change-Id: I06f9063ddf32f9296e5e523454b19e8b5692c285
    Reviewed-on: https://gerrit.libreoffice.org/32630
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index f8e2c3c..3c43672 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -377,7 +377,7 @@ static bool rebalanceChildren(int balance, const bool force)
     balance -= available;
     balance -= OutstandingForks;
 
-    if (balance > 0 && (force || rebalance || durationMs >= CHILD_TIMEOUT_MS))
+    if (balance > 0 && (force || rebalance || OutstandingForks == 0))
     {
         LOG_DBG("prespawnChildren: Have " << available << " spare " <<
                 (available == 1 ? "child" : "children") <<