You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2017/09/29 17:58:10 UTC
qpid-cpp git commit: QPID-7895: Additional race condition fixed
Repository: qpid-cpp
Updated Branches:
refs/heads/master a7c9d1baf -> 81739de5a
QPID-7895: Additional race condition fixed
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/81739de5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/81739de5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/81739de5
Branch: refs/heads/master
Commit: 81739de5a368cef2826054f7ff7962b60e4e564e
Parents: a7c9d1b
Author: Kim van der Riet <kp...@apache.org>
Authored: Fri Sep 29 13:57:45 2017 -0400
Committer: Kim van der Riet <kp...@apache.org>
Committed: Fri Sep 29 13:57:45 2017 -0400
----------------------------------------------------------------------
src/qpid/linearstore/JournalImpl.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/81739de5/src/qpid/linearstore/JournalImpl.cpp
----------------------------------------------------------------------
diff --git a/src/qpid/linearstore/JournalImpl.cpp b/src/qpid/linearstore/JournalImpl.cpp
index 6f2a7f6..2050c34 100644
--- a/src/qpid/linearstore/JournalImpl.cpp
+++ b/src/qpid/linearstore/JournalImpl.cpp
@@ -67,13 +67,13 @@ void InactivityFireEvent::fire() {
if (_state != RUNNING) {
return;
}
- _state = FIRED;
- }
- {
- ::qpid::sys::Mutex::ScopedLock sl(_ifeParentLock);
- if (_parent) {
- _parent->flushFire();
+ {
+ ::qpid::sys::Mutex::ScopedLock sl(_ifeParentLock);
+ if (_parent) {
+ _parent->flushFire();
+ }
}
+ _state = FIRED;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org