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

[Ashod Nakashian]

 loolwsd/LOOLWSD.cpp         |    1 +
 loolwsd/test/run_unit.sh.in |    5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d978dc83cf25ac7240eaac15d0950cc1e684651e
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon Nov 7 18:22:25 2016 -0500

    loolwsd: minor improvement to logging while running tests
    
    Change-Id: Id602e52ceb42923f19d902f653e2d6477b8b8e1f
    Reviewed-on: https://gerrit.libreoffice.org/30676
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/test/run_unit.sh.in b/loolwsd/test/run_unit.sh.in
index 06ee8a9..8463f4d 100755
--- a/loolwsd/test/run_unit.sh.in
+++ b/loolwsd/test/run_unit.sh.in
@@ -6,7 +6,6 @@
 echo
 echo "Running unit-test:"
 echo $0 $@
-echo
 
 # substituted variables in one place:
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -57,7 +56,7 @@ if test "z$enable_debug" != "ztrue"; then
 fi
 
 # result logging
-echo "test output is '$test_output'"
+echo "Test output is '$test_output'"
 echo > $test_output
 
 if test "z$tst" == "z"; then
@@ -65,7 +64,7 @@ if test "z$tst" == "z"; then
      export LOOL_TEST_CLIENT_PORT=9984
      export LOOL_TEST_MASTER_PORT=9985
 
-     echo "executing external tests"
+     echo "Executing external tests"
      ${valgrind} \
      ${abs_top_builddir}/loolwsd --o:sys_template_path="$systemplate_path" \
                                  --o:lo_template_path="$lo_path" \
commit 0164df61a59ee95396c29634dea0370dae9ee2b6
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon Nov 7 18:21:54 2016 -0500

    loolwsd: alertAllUsersOfDocument must be called while holding lock
    
    Change-Id: I266a61402973c9418eb293d2f66601d00be76754
    Reviewed-on: https://gerrit.libreoffice.org/30675
    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 6334a2c..39a3239 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -2123,6 +2123,7 @@ void alertAllUsers(const std::string& cmd, const std::string& kind)
 
     for (auto& brokerIt : DocBrokers)
     {
+        auto lock = brokerIt.second->getLock();
         brokerIt.second->alertAllUsersOfDocument(cmd, kind);
     }
 }