2 files changed, 16 insertions, 0 deletions
diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp
index e00f394a01..460a11d0f0 100644
--- a/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/cpp/src/qpid/management/ManagementAgent.cpp
@@ -194,6 +194,7 @@ ObjectId ManagementAgent::addObject(ManagementObject* object,
     }
 
     ObjectId objId(0 /*flags*/ , sequence, brokerBank, 0, objectNum);
+    objId.setV2Key(object->getKey());
 
     object->setObjectId(objId);
     newManagementObjects[objId] = object;
diff --git a/cpp/src/qpid/management/ManagementObject.cpp b/cpp/src/qpid/management/ManagementObject.cpp
index bcb6159663..6cbe386517 100644
--- a/cpp/src/qpid/management/ManagementObject.cpp
+++ b/cpp/src/qpid/management/ManagementObject.cpp
@@ -169,6 +169,21 @@ void ManagementObject::writeTimestamps (framing::Buffer& buf)
     objectId.encode(buf);
 }
 
+void ManagementObject::readTimestamps (framing::Buffer& buf)
+{
+    std::string unused;
+    uint8_t unusedUuid[16];
+    ObjectId unusedObjectId;
+
+    buf.getShortString(unused);
+    buf.getShortString(unused);
+    buf.getBin128(unusedUuid);
+    updateTime = buf.getLongLong();
+    createTime = buf.getLongLong();
+    destroyTime = buf.getLongLong();
+    unusedObjectId.decode(buf);
+}
+
 void ManagementObject::setReference(ObjectId) {}
 
 int ManagementObject::getThreadIndex() {