From bab8070ad7989386b11f4106d9f15e73d9246c1d Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Sun, 8 Mar 2009 23:52:35 +0000 Subject: Fixed race conditions in cluster. Execute all cluster logic in frameDeliverQueue thread, decoding only in eventDeliverQueue thread. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@751557 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/EventFrame.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cpp/src/qpid/cluster/EventFrame.cpp') diff --git a/cpp/src/qpid/cluster/EventFrame.cpp b/cpp/src/qpid/cluster/EventFrame.cpp index 4de76eafbe..1a57528c3a 100644 --- a/cpp/src/qpid/cluster/EventFrame.cpp +++ b/cpp/src/qpid/cluster/EventFrame.cpp @@ -24,16 +24,16 @@ namespace qpid { namespace cluster { -EventFrame::EventFrame() : eventId(0) {} +EventFrame::EventFrame() {} EventFrame::EventFrame(const EventHeader& e, const framing::AMQFrame& f, int rc) - : connectionId(e.getConnectionId()), frame(f), eventId(e.getId()), readCredit(rc), type(e.getType()) + : connectionId(e.getConnectionId()), frame(f), readCredit(rc), type(e.getType()) { QPID_LATENCY_INIT(frame); } std::ostream& operator<<(std::ostream& o, const EventFrame& e) { - return o << e.frame << "(from event " << e.eventId << " read-credit=" << e.readCredit << ")"; + return o << e.frame << " " << e.type << " " << e.connectionId << " read-credit=" << e.readCredit; } }} // namespace qpid::cluster -- cgit v1.2.1