QPID-1279 Implementations of management methods can now return error strings along with its own error codes

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

2 files changed, 5 insertions, 4 deletions

diff --git a/qpid/cpp/managementgen/qmf/schema.py b/qpid/cpp/managementgen/qmf/schema.py
index 9263c29543..26bad618f7 100755
--- a/qpid/cpp/managementgen/qmf/schema.py
+++ b/qpid/cpp/managementgen/qmf/schema.py
@@ -1004,9 +1004,9 @@ class SchemaClass:
                                                    arg.name, "inBuf") + ";\n")
 
       stream.write ("        status = coreObject->ManagementMethod (METHOD_" +\
-                    method.getName().upper() + ", ioArgs);\n")
+                    method.getName().upper() + ", ioArgs, text);\n")
       stream.write ("        outBuf.putLong        (status);\n")
-      stream.write ("        outBuf.putShortString (Manageable::StatusText (status));\n")
+      stream.write ("        outBuf.putShortString (Manageable::StatusText (status, text));\n")
       for arg in method.args:
         if arg.getDir () == "O" or arg.getDir () == "IO":
           stream.write ("        " +\
diff --git a/qpid/cpp/managementgen/qmf/templates/Class.cpp b/qpid/cpp/managementgen/qmf/templates/Class.cpp
index 2a0e55b34d..018f325ff1 100644
--- a/qpid/cpp/managementgen/qmf/templates/Class.cpp
+++ b/qpid/cpp/managementgen/qmf/templates/Class.cpp
@@ -172,9 +172,10 @@ void /*MGEN:Class.NameCap*/::writeStatistics (Buffer& buf, bool skipHeaders)
 void /*MGEN:Class.NameCap*/::doMethod (/*MGEN:Class.DoMethodArgs*/)
 {
     Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD;
+    std::string          text;
 /*MGEN:Class.MethodHandlers*/
-    outBuf.putLong        (status);
-    outBuf.putShortString (Manageable::StatusText (status));
+    outBuf.putLong(status);
+    outBuf.putShortString(Manageable::StatusText(status, text));
 }
 
 /*MGEN:Class.EventMethodBodies*/