diff options
| author | Ken Giusti <kgiusti@apache.org> | 2010-12-02 21:03:42 +0000 |
|---|---|---|
| committer | Ken Giusti <kgiusti@apache.org> | 2010-12-02 21:03:42 +0000 |
| commit | f0d08c52853c4f3e95e5760add64f0e1258f9032 (patch) | |
| tree | 5afe1c38e7a72b9fd3b85a13130947ffbc544d64 | |
| parent | ae36a4b3b7876809c99d1d77dc1eb5638cc7960f (diff) | |
| download | qpid-python-f0d08c52853c4f3e95e5760add64f0e1258f9032.tar.gz | |
bugfix in deleted obj import/export api
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1041582 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/src/qpid/management/ManagementAgent.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp index 6295f56226..9d9cfb5164 100644 --- a/cpp/src/qpid/management/ManagementAgent.cpp +++ b/cpp/src/qpid/management/ManagementAgent.cpp @@ -681,7 +681,9 @@ void ManagementAgent::periodicProcessing (void) dptr->packageName = delObj->getPackageName(); dptr->className = delObj->getClassName(); - delObj->getObjectId().encode(dptr->objectId); + stringstream oid; + oid << delObj->getObjectId(); + dptr->objectId = oid.str(); if (qmf1Support) { delObj->writeProperties(dptr->encodedV1Config); @@ -2862,6 +2864,8 @@ Variant ManagementAgent::toVariant(const boost::shared_ptr<FieldValue>& in) // next (last) publish-ment. void ManagementAgent::exportDeletedObjects(DeletedObjectList& outList) { + outList.clear(); + sys::Mutex::ScopedLock lock (userLock); list<pair<ObjectId, ManagementObject*> > deleteList; @@ -2890,7 +2894,9 @@ void ManagementAgent::exportDeletedObjects(DeletedObjectList& outList) dptr->packageName = delObj->getPackageName(); dptr->className = delObj->getClassName(); - delObj->getObjectId().encode(dptr->objectId); + stringstream oid; + oid << delObj->getObjectId(); + dptr->objectId = oid.str(); if (qmf1Support) { delObj->writeProperties(dptr->encodedV1Config); |