diff options
| author | Ted Ross <tross@apache.org> | 2012-11-30 19:17:28 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2012-11-30 19:17:28 +0000 |
| commit | df3fd9dedb97d5e9932c9e56c024459c89d46dee (patch) | |
| tree | 5b7543a2ee6d2e34f869f09ef8b9355b83b8461c /cpp/src/qpid/broker/SemanticState.cpp | |
| parent | a4be64d80bfa5517250e1e16becb2f951b440c3f (diff) | |
| download | qpid-python-df3fd9dedb97d5e9932c9e56c024459c89d46dee.tar.gz | |
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
Diffstat (limited to 'cpp/src/qpid/broker/SemanticState.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/SemanticState.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/cpp/src/qpid/broker/SemanticState.cpp index 0dc8d6cdfe..f6411c98dd 100644 --- a/cpp/src/qpid/broker/SemanticState.cpp +++ b/cpp/src/qpid/broker/SemanticState.cpp @@ -303,14 +303,14 @@ Consumer(_name, type), deliveryCount(0), protocols(parent->getSession().getBroker().getProtocolRegistry()) { - if (parent != 0 && queue.get() != 0 && queue->GetManagementObjectShared() !=0) + if (parent != 0 && queue.get() != 0 && queue->GetManagementObject() !=0) { ManagementAgent* agent = parent->session.getBroker().getManagementAgent(); qpid::management::Manageable* ms = dynamic_cast<qpid::management::Manageable*> (&(parent->session)); if (agent != 0) { - mgmtObject = _qmf::Subscription::shared_ptr(new _qmf::Subscription(agent, this, ms , queue->GetManagementObjectShared()->getObjectId(), getTag(), + mgmtObject = _qmf::Subscription::shared_ptr(new _qmf::Subscription(agent, this, ms , queue->GetManagementObject()->getObjectId(), getTag(), !acquire, ackExpected, exclusive, ManagementAgent::toMap(arguments))); agent->addObject (mgmtObject); mgmtObject->set_creditMode("WINDOW"); @@ -318,7 +318,7 @@ Consumer(_name, type), } } -ManagementObject::shared_ptr SemanticState::ConsumerImpl::GetManagementObjectShared (void) const +ManagementObject::shared_ptr SemanticState::ConsumerImpl::GetManagementObject (void) const { return mgmtObject; } |