QPID-687: comitted qpid-patch7-cpp.diff qpid-patch7-python.diff

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@595453 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 30 deletions

diff --git a/cpp/src/qpid/management/ManagementObject.cpp b/cpp/src/qpid/management/ManagementObject.cpp
index 24588b4edd..c2d1f56be0 100644
--- a/cpp/src/qpid/management/ManagementObject.cpp
+++ b/cpp/src/qpid/management/ManagementObject.cpp
@@ -21,41 +21,17 @@
  
 #include "Manageable.h"
 #include "ManagementObject.h"
+#include "qpid/framing/FieldTable.h"
 
 using namespace qpid::framing;
 using namespace qpid::management;
 using namespace qpid::sys;
 
-void ManagementObject::schemaItem (Buffer&     buf,
-                                   uint8_t     typeCode,
-                                   std::string name,
-                                   std::string description,
-                                   bool        isConfig,
-                                   bool        isIndex)
-{
-    uint8_t flags =
-        (isConfig ? FLAG_CONFIG : 0) | (isIndex ? FLAG_INDEX : 0);
-
-    buf.putOctet       (flags);
-    buf.putOctet       (typeCode);
-    buf.putShortString (name);
-    buf.putShortString (description);
-}
-
-void ManagementObject::schemaListBegin (Buffer& buf)
-{
-    schemaItem (buf, TYPE_UINT64, "id", "Object ID", true, true);
-}
-
-void ManagementObject::schemaListEnd (Buffer& buf)
-{
-    buf.putOctet (FLAG_END);
-}
-
 void ManagementObject::writeTimestamps (Buffer& buf)
 {
-    buf.putLongLong (uint64_t (Duration (now ())));
-    buf.putLongLong (createTime);
-    buf.putLongLong (destroyTime);
-    buf.putLongLong (objectId);
+    buf.putShortString (className);
+    buf.putLongLong    (uint64_t (Duration (now ())));
+    buf.putLongLong    (createTime);
+    buf.putLongLong    (destroyTime);
+    buf.putLongLong    (objectId);
 }