From a97688f2d3e2e5fb73b643f186660c0676923db3 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 12 Feb 2008 23:09:06 +0000 Subject: Patches from Ted Ross: Fix for bignumber problem in the management console. Fix for broker crash when sessions are closed via management. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@627171 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/SessionState.cpp | 2 ++ cpp/src/qpid/management/ManagementAgent.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'cpp/src') 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; -- cgit v1.2.1