diff options
Diffstat (limited to 'cpp/src/qpid')
| -rw-r--r-- | cpp/src/qpid/broker/SessionState.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/management/ManagementAgent.cpp | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp index 1021cca1b1..80fafe0386 100644 --- a/cpp/src/qpid/broker/SessionState.cpp +++ b/cpp/src/qpid/broker/SessionState.cpp @@ -147,12 +147,14 @@ Manageable::status_t SessionState::ManagementMethod (uint32_t methodId, break; case management::Session::METHOD_CLOSE : + /* if (handler != 0) { handler->getConnection().closeChannel(handler->getChannel()); } status = Manageable::STATUS_OK; break; + */ case management::Session::METHOD_SOLICITACK : case management::Session::METHOD_RESETLIFESPAN : diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp index 39fab270af..709f2a0ecd 100644 --- a/cpp/src/qpid/management/ManagementAgent.cpp +++ b/cpp/src/qpid/management/ManagementAgent.cpp @@ -74,16 +74,16 @@ void ManagementAgent::setExchange (broker::Exchange::shared_ptr _mexchange, } void ManagementAgent::addObject (ManagementObject::shared_ptr object, - uint64_t persistenceId, - uint64_t idOffset) + uint64_t /*persistenceId*/, + uint64_t /*idOffset*/) { RWlock::ScopedWlock writeLock (userLock); uint64_t objectId; - if (persistenceId == 0) +// if (persistenceId == 0) objectId = nextObjectId++; - else - objectId = 0x8000000000000000ULL | (persistenceId + idOffset); +// else +// objectId = 0x8000000000000000ULL | (persistenceId + idOffset); object->setObjectId (objectId); managementObjects[objectId] = object; |