diff options
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Queue.cpp | 12 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/SessionState.cpp | 1 |
2 files changed, 10 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp index 0b26762697..1eeb1fb7f8 100644 --- a/qpid/cpp/src/qpid/broker/Queue.cpp +++ b/qpid/cpp/src/qpid/broker/Queue.cpp @@ -578,11 +578,17 @@ uint64_t Queue::getPersistenceId() const } void Queue::setPersistenceId(uint64_t _persistenceId) const -{ - if (mgmtObject != 0 && persistenceId == 0) +{ + if (mgmtObject.get() != 0 && persistenceId == 0) { ManagementAgent::shared_ptr agent = ManagementAgent::getAgent (); agent->addObject (mgmtObject, _persistenceId, 3); + + if (externalQueueStore) { + ManagementObject::shared_ptr childObj = externalQueueStore->GetManagementObject(); + if (childObj.get() != 0) + childObj->setReference(mgmtObject->getObjectId()); + } } persistenceId = _persistenceId; } @@ -669,7 +675,7 @@ void Queue::setExternalQueueStore(ExternalQueueStore* inst) { if (inst) { ManagementObject::shared_ptr childObj = inst->GetManagementObject(); - if (childObj.get() != 0) + if (childObj.get() != 0 && mgmtObject.get() != 0) childObj->setReference(mgmtObject->getObjectId()); } } diff --git a/qpid/cpp/src/qpid/broker/SessionState.cpp b/qpid/cpp/src/qpid/broker/SessionState.cpp index 1ddb3f3026..dada7567f9 100644 --- a/qpid/cpp/src/qpid/broker/SessionState.cpp +++ b/qpid/cpp/src/qpid/broker/SessionState.cpp @@ -62,6 +62,7 @@ SessionState::SessionState( mgmtObject = management::Session::shared_ptr (new management::Session (this, parent, getId().getName())); mgmtObject->set_attached (0); + mgmtObject->set_detachedLifespan (0); agent->addObject (mgmtObject); } } |