Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 92719 invoked from network); 2 Dec 2010 21:05:15 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Dec 2010 21:05:15 -0000 Received: (qmail 90049 invoked by uid 500); 2 Dec 2010 21:05:15 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 90023 invoked by uid 500); 2 Dec 2010 21:05:14 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 90016 invoked by uid 99); 2 Dec 2010 21:05:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Dec 2010 21:05:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Dec 2010 21:05:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BCCE12388906; Thu, 2 Dec 2010 21:03:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041582 - /qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp Date: Thu, 02 Dec 2010 21:03:42 -0000 To: commits@qpid.apache.org From: kgiusti@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101202210342.BCCE12388906@eris.apache.org> Author: kgiusti Date: Thu Dec 2 21:03:42 2010 New Revision: 1041582 URL: http://svn.apache.org/viewvc?rev=1041582&view=rev Log: bugfix in deleted obj import/export api Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp?rev=1041582&r1=1041581&r2=1041582&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp (original) +++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp Thu Dec 2 21:03:42 2010 @@ -681,7 +681,9 @@ void ManagementAgent::periodicProcessing 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 // next (last) publish-ment. void ManagementAgent::exportDeletedObjects(DeletedObjectList& outList) { + outList.clear(); + sys::Mutex::ScopedLock lock (userLock); list > deleteList; @@ -2890,7 +2894,9 @@ void ManagementAgent::exportDeletedObjec 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); --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org