summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorKenneth Anthony Giusti <kgiusti@apache.org>2010-12-02 21:03:42 +0000
committerKenneth Anthony Giusti <kgiusti@apache.org>2010-12-02 21:03:42 +0000
commitfee37d130d2e2af1b1f58b803cc4a72108dec1f9 (patch)
tree5afe1c38e7a72b9fd3b85a13130947ffbc544d64 /cpp/src
parentae0a6e4ec90ed785efb692a5912afedecd734831 (diff)
downloadqpid-python-fee37d130d2e2af1b1f58b803cc4a72108dec1f9.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
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/management/ManagementAgent.cpp10
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);