From f178cf0cfd591e786253ed77a049b442cbce6fa9 Mon Sep 17 00:00:00 2001 From: jsteemann Date: Wed, 7 Sep 2016 15:10:26 +0200 Subject: [PATCH] potentially fix logic errors --- arangod/Wal/CollectorThread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arangod/Wal/CollectorThread.cpp b/arangod/Wal/CollectorThread.cpp index 2d6a909030..110800b91c 100644 --- a/arangod/Wal/CollectorThread.cpp +++ b/arangod/Wal/CollectorThread.cpp @@ -244,7 +244,7 @@ int CollectorThread::waitForResult(uint64_t timeout) { CONDITION_LOCKER(guard, _collectorResultCondition); if (_collectorResult == TRI_ERROR_NO_ERROR) { - if (guard.wait(timeout)) { + if (!guard.wait(timeout)) { return TRI_ERROR_LOCK_TIMEOUT; } } @@ -385,6 +385,7 @@ int CollectorThread::collectLogfiles(bool& worked) { { CONDITION_LOCKER(guard, _collectorResultCondition); _collectorResult = TRI_ERROR_NO_ERROR; + _collectorResultCondition.broadcast(); } #ifdef ARANGODB_ENABLE_ROCKSDB