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

1 files changed, 2 insertions, 2 deletions

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);