You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2008/02/13 00:09:07 UTC
svn commit: r627171 - in /incubator/qpid/trunk/qpid/cpp/src/qpid:
broker/SessionState.cpp management/ManagementAgent.cpp
Author: aconway
Date: Tue Feb 12 15:09:06 2008
New Revision: 627171
URL: http://svn.apache.org/viewvc?rev=627171&view=rev
Log:
Patches from Ted Ross:
Fix for bignumber problem in the management console.
Fix for broker crash when sessions are closed via management.
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp?rev=627171&r1=627170&r2=627171&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp Tue Feb 12 15:09:06 2008
@@ -147,12 +147,14 @@
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 :
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp?rev=627171&r1=627170&r2=627171&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp Tue Feb 12 15:09:06 2008
@@ -74,16 +74,16 @@
}
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;