Repository: qpid-cpp Updated Branches: refs/heads/master 91ed1489d -> 428eafa1f
QPID-8220: Proposed fix for timer error message issue, also minor change to error message itself to make less confusing Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/428eafa1 Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/428eafa1 Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/428eafa1 Branch: refs/heads/master Commit: 428eafa1f65e22e04ea63b73aebcc192282df72c Parents: 91ed148 Author: Kim van der Riet <[email protected]> Authored: Tue Jul 24 09:32:47 2018 -0400 Committer: Kim van der Riet <[email protected]> Committed: Tue Jul 24 09:32:47 2018 -0400 ---------------------------------------------------------------------- src/qpid/linearstore/JournalImpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/428eafa1/src/qpid/linearstore/JournalImpl.cpp ---------------------------------------------------------------------- diff --git a/src/qpid/linearstore/JournalImpl.cpp b/src/qpid/linearstore/JournalImpl.cpp index 9c89e12..d81bfaa 100644 --- a/src/qpid/linearstore/JournalImpl.cpp +++ b/src/qpid/linearstore/JournalImpl.cpp @@ -32,7 +32,7 @@ namespace linearstore { InactivityFireEvent::InactivityFireEvent(JournalImpl* p, const ::qpid::sys::Duration timeout): - ::qpid::sys::TimerTask(timeout, "JournalInactive:"+p->id()), _parent(p), + ::qpid::sys::TimerTask(timeout, p->id()), _parent(p), _state(NOT_ADDED) {} @@ -43,7 +43,7 @@ void InactivityFireEvent::reset(qpid::sys::Timer& timer) { timer.add(this); break; case FIRED : - setupNextFire(); + restart(); timer.add(this); break; case FLUSHED: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
