1 files changed, 37 insertions, 51 deletions

diff --git a/qpid/cpp/src/qmf/ObjectImpl.cpp b/qpid/cpp/src/qmf/ObjectImpl.cpp
index 645ccd5c81..1ea2d54527 100644
--- a/qpid/cpp/src/qmf/ObjectImpl.cpp
+++ b/qpid/cpp/src/qmf/ObjectImpl.cpp
@@ -45,30 +45,40 @@ ObjectImpl::ObjectImpl(Object* e, const SchemaObjectClass* type) :
     }
 }
 
-ObjectImpl::ObjectImpl(const SchemaObjectClass* type, Buffer& buffer) :
-    envelope(new Object(this)), objectClass(type), createTime(uint64_t(Duration(now()))),
-    destroyTime(0), lastUpdatedTime(createTime)
+ObjectImpl::ObjectImpl(const SchemaObjectClass* type, Buffer& buffer, bool prop, bool stat, bool managed) :
+    envelope(new Object(this)), objectClass(type), createTime(0), destroyTime(0), lastUpdatedTime(0)
 {
-    int propCount = objectClass->getPropertyCount();
-    int statCount = objectClass->getStatisticCount();
     int idx;
-    set<string> excludes;
 
-    parsePresenceMasks(buffer, excludes);
-    for (idx = 0; idx < propCount; idx++) {
-        const SchemaProperty* prop = objectClass->getProperty(idx);
-        if (excludes.count(prop->getName()) != 0) {
-            properties[prop->getName()] = ValuePtr(new Value(prop->getType()));
-        } else {
-            ValueImpl* pval = new ValueImpl(prop->getType(), buffer);
-            properties[prop->getName()] = ValuePtr(pval->envelope);
+    if (managed) {
+        lastUpdatedTime = buffer.getLongLong();
+        createTime = buffer.getLongLong();
+        destroyTime = buffer.getLongLong();
+        objectId.reset(new ObjectIdImpl(buffer));
+    }
+
+    if (prop) {
+        int propCount = objectClass->getPropertyCount();
+        set<string> excludes;
+        parsePresenceMasks(buffer, excludes);
+        for (idx = 0; idx < propCount; idx++) {
+            const SchemaProperty* prop = objectClass->getProperty(idx);
+            if (excludes.count(prop->getName()) != 0) {
+                properties[prop->getName()] = ValuePtr(new Value(prop->getType()));
+            } else {
+                ValueImpl* pval = new ValueImpl(prop->getType(), buffer);
+                properties[prop->getName()] = ValuePtr(pval->envelope);
+            }
         }
     }
 
-    for (idx = 0; idx < statCount; idx++) {
-        const SchemaStatistic* stat = objectClass->getStatistic(idx);
-        ValueImpl* sval = new ValueImpl(stat->getType(), buffer);
-        statistics[stat->getName()] = ValuePtr(sval->envelope);
+    if (stat) {
+        int statCount = objectClass->getStatisticCount();
+        for (idx = 0; idx < statCount; idx++) {
+            const SchemaStatistic* stat = objectClass->getStatistic(idx);
+            ValueImpl* sval = new ValueImpl(stat->getType(), buffer);
+            statistics[stat->getName()] = ValuePtr(sval->envelope);
+        }
     }
 }
 
@@ -82,7 +92,7 @@ void ObjectImpl::destroy()
     // TODO - flag deletion
 }
 
-Value* ObjectImpl::getValue(const string& key)
+Value* ObjectImpl::getValue(const string& key) const
 {
     map<string, ValuePtr>::const_iterator iter;
 
@@ -133,7 +143,7 @@ void ObjectImpl::encodeManagedObjectData(qpid::framing::Buffer& buffer) const
     buffer.putLongLong(lastUpdatedTime);
     buffer.putLongLong(createTime);
     buffer.putLongLong(destroyTime);
-    objectId->impl->encode(buffer);
+    objectId->encode(buffer);
 }
 
 void ObjectImpl::encodeProperties(qpid::framing::Buffer& buffer) const
@@ -187,36 +197,12 @@ void ObjectImpl::encodeStatistics(qpid::framing::Buffer& buffer) const
 //==================================================================
 
 Object::Object(const SchemaObjectClass* type) : impl(new ObjectImpl(this, type)) {}
-
 Object::Object(ObjectImpl* i) : impl(i) {}
-
-Object::~Object()
-{
-    delete impl;
-}
-
-void Object::destroy()
-{
-    impl->destroy();
-}
-
-const ObjectId* Object::getObjectId() const
-{
-    return impl->getObjectId();
-}
-
-void Object::setObjectId(ObjectId* oid)
-{
-    impl->setObjectId(oid);
-}
-
-const SchemaObjectClass* Object::getClass() const
-{
-    return impl->getClass();
-}
-
-Value* Object::getValue(char* key)
-{
-    return impl->getValue(key);
-}
+Object::Object(const Object& from) : impl(new ObjectImpl(*(from.impl))) {}
+Object::~Object() { delete impl; }
+void Object::destroy() { impl->destroy(); }
+const ObjectId* Object::getObjectId() const { return impl->getObjectId(); }
+void Object::setObjectId(ObjectId* oid) { impl->setObjectId(oid); }
+const SchemaObjectClass* Object::getClass() const { return impl->getClass(); }
+Value* Object::getValue(char* key) const { return impl->getValue(key); }