From 3f6ca2bd3e2fe214e74f89b5847c37602ddf74cf Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Wed, 19 Jun 2013 14:26:11 +0000 Subject: QPID-4905: Stopped broker::Broker needing to refer to broker::Connection - Also removed ConnectionToken which didn't add anything over OwnershipToken git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1494640 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/SessionState.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cpp/src/qpid/broker/SessionState.cpp') diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp index ccf77413df..f9b84dc9fb 100644 --- a/cpp/src/qpid/broker/SessionState.cpp +++ b/cpp/src/qpid/broker/SessionState.cpp @@ -101,7 +101,7 @@ Connection& SessionState::getConnection() { return handler->getConnection(); } -bool SessionState::isLocal(const ConnectionToken* t) const +bool SessionState::isLocal(const OwnershipToken* t) const { return isAttached() && &(handler->getConnection()) == t; } @@ -204,7 +204,7 @@ void SessionState::handleContent(AMQFrame& frame, const SequenceNumber& id) DeliverableMessage deliverable(Message(msg, msg), semanticState.getTxBuffer()); if (broker.isTimestamping()) deliverable.getMessage().setTimestamp(); - deliverable.getMessage().setPublisher(&getConnection()); + deliverable.getMessage().setPublisher(getConnection()); IncompleteIngressMsgXfer xfer(this, msg); -- cgit v1.2.1