Fix double locking of mutex of condition variable.

neunhoef · neunhoef · commit 7ed306c2e773 · 2016-05-06T23:25:19.000+02:00
diff --git a/arangod/Cluster/AgencyCallback.cpp b/arangod/Cluster/AgencyCallback.cpp
@@ -137,10 +137,12 @@ void AgencyCallback::executeByCallbackOrTimeout(double maxTimeout) {
     compareBuilder = _lastData;
   }
   
-  CONDITION_LOCKER(locker, _cv);
-  _useCv = true;
-  locker.wait(static_cast<uint64_t>(maxTimeout * 1000000.0));
-  _useCv = false;
+  {
+    CONDITION_LOCKER(locker, _cv);
+    _useCv = true;
+    locker.wait(static_cast<uint64_t>(maxTimeout * 1000000.0));
+    _useCv = false;
+  }
   
   if (!_lastData || _lastData->slice().equals(compareBuilder->slice())) {
     LOG(DEBUG) << "Waiting done and nothing happended. Refetching to be sure";
