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

[Ashod Nakashian]

 wsd/LOOLWSD.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 26ac97826614dc8e6f1f09199023e63fa240c31d
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date:   Mon Apr 3 21:07:53 2017 -0400

    wsd: don't close invalid forkit pipe
    
    Change-Id: Ib66df894560ad592a7e90774897cb82b573dc77d
    Reviewed-on: https://gerrit.libreoffice.org/36056
    Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
    Tested-by: Ashod Nakashian <ashnak...@gmail.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 1ac9efa2..19259e56 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -347,7 +347,7 @@ static int rebalanceChildren(int balance)
 {
     Util::assertIsLocked(NewChildrenMutex);
 
-    LOG_WRN("rebalance children to " << balance);
+    LOG_TRC("rebalance children to " << balance);
 
     // Do the cleanup first.
     const bool rebalance = cleanupChildren();
@@ -1182,9 +1182,9 @@ bool LOOLWSD::createForKit()
     ForKitProcId = -1;
     Admin::instance().setForKitPid(ForKitProcId);
 
-    const int oldForKitWritePipe = ForKitWritePipe;
+    if (ForKitWritePipe != -1)
+        close(ForKitWritePipe);
     ForKitWritePipe = -1;
-    close(oldForKitWritePipe);
 
     // ForKit always spawns one.
     ++OutstandingForks;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits