From df3fd9dedb97d5e9932c9e56c024459c89d46dee Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Fri, 30 Nov 2012 19:17:28 +0000 Subject: QPID-4449 - Reverted much of the original change and re-implemented the fix in a simpler way. The build-define _IN_QPID_BROKER is now used for modules built in the broker. The shared-pointer changes are conditionally compiled only for in-broker cases. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1415796 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/SessionState.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 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 f48bf653fb..a6494bc362 100644 --- a/cpp/src/qpid/broker/SessionState.cpp +++ b/cpp/src/qpid/broker/SessionState.cpp @@ -65,7 +65,7 @@ SessionState::SessionState( } void SessionState::addManagementObject() { - if (GetManagementObjectShared()) return; // Already added. + if (GetManagementObject()) return; // Already added. Manageable* parent = broker.GetVhostObject (); if (parent != 0) { ManagementAgent* agent = getBroker().getManagementAgent(); @@ -127,7 +127,7 @@ void SessionState::attach(SessionHandler& h) { if (mgmtObject != 0) { mgmtObject->set_attached (1); - mgmtObject->set_connectionRef (h.getConnection().GetManagementObjectShared()->getObjectId()); + mgmtObject->set_connectionRef (h.getConnection().GetManagementObject()->getObjectId()); mgmtObject->set_channelId (h.getChannel()); } asyncCommandCompleter->attached(); @@ -148,7 +148,7 @@ void SessionState::giveReadCredit(int32_t credit) { getConnection().outputTasks.giveReadCredit(credit); } -ManagementObject::shared_ptr SessionState::GetManagementObjectShared (void) const +ManagementObject::shared_ptr SessionState::GetManagementObject(void) const { return mgmtObject; } -- cgit v1.2.1