From 3a1e10eecb0fe332da29e5183d137ec23f74940a Mon Sep 17 00:00:00 2001 From: Kaveh Vahedipour Date: Mon, 1 Aug 2016 14:41:13 +0000 Subject: [PATCH] integrated agency bugfix from 3.0 --- arangod/Agency/State.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arangod/Agency/State.cpp b/arangod/Agency/State.cpp index e91157b5c4..dac5c35be2 100644 --- a/arangod/Agency/State.cpp +++ b/arangod/Agency/State.cpp @@ -173,9 +173,10 @@ void State::removeConflicts (query_t const& transactions) { try { auto idx = slice[0].get("index").getUInt(); if (idx-_cur < _log.size()) { - LOG_TOPIC(INFO, Logger::AGENCY) << - "Removing " << _log.size()-idx+_cur << " entries from log starting with " << idx; - _log.erase(_log.begin()+idx); + LOG_TOPIC(INFO, Logger::AGENCY) + << "Removing " << _log.size()-idx+_cur + << " entries from log starting with " << idx; + _log.erase(_log.begin()+idx); } } catch (std::exception const& e) { LOG_TOPIC(ERR, Logger::AGENCY) << e.what() << " " << __FILE__ << __LINE__;