From 8adca7262ae82e2bfe5331d4264e3e7865a0181a Mon Sep 17 00:00:00 2001
From: Ted Ross <tross@apache.org>
Date: Fri, 24 Oct 2008 15:15:59 +0000
Subject: Use a str16 instead of str8 for qmf method response text

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@707653 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/agent/ManagementAgentImpl.cpp   |  8 ++++----
 cpp/src/qpid/management/ManagementBroker.cpp | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'cpp/src')

diff --git a/cpp/src/qpid/agent/ManagementAgentImpl.cpp b/cpp/src/qpid/agent/ManagementAgentImpl.cpp
index 36e56e48ae..d752312843 100644
--- a/cpp/src/qpid/agent/ManagementAgentImpl.cpp
+++ b/cpp/src/qpid/agent/ManagementAgentImpl.cpp
@@ -370,13 +370,13 @@ void ManagementAgentImpl::invokeMethodRequest(Buffer& inBuffer, uint32_t sequenc
 
     ManagementObjectMap::iterator iter = managementObjects.find(objId);
     if (iter == managementObjects.end() || iter->second->isDeleted()) {
-        outBuffer.putLong       (Manageable::STATUS_UNKNOWN_OBJECT);
-        outBuffer.putShortString(Manageable::StatusText(Manageable::STATUS_UNKNOWN_OBJECT));
+        outBuffer.putLong        (Manageable::STATUS_UNKNOWN_OBJECT);
+        outBuffer.putMediumString(Manageable::StatusText(Manageable::STATUS_UNKNOWN_OBJECT));
     } else {
         if ((iter->second->getPackageName() != packageName) ||
             (iter->second->getClassName()   != className)) {
             outBuffer.putLong        (Manageable::STATUS_INVALID_PARAMETER);
-            outBuffer.putShortString (Manageable::StatusText (Manageable::STATUS_INVALID_PARAMETER));
+            outBuffer.putMediumString(Manageable::StatusText (Manageable::STATUS_INVALID_PARAMETER));
         }
         else
             try {
@@ -385,7 +385,7 @@ void ManagementAgentImpl::invokeMethodRequest(Buffer& inBuffer, uint32_t sequenc
             } catch(std::exception& e) {
                 outBuffer.restore();
                 outBuffer.putLong(Manageable::STATUS_EXCEPTION);
-                outBuffer.putShortString(e.what());
+                outBuffer.putMediumString(e.what());
             }
     }
 
diff --git a/cpp/src/qpid/management/ManagementBroker.cpp b/cpp/src/qpid/management/ManagementBroker.cpp
index 480c63b03a..53c82d17e4 100644
--- a/cpp/src/qpid/management/ManagementBroker.cpp
+++ b/cpp/src/qpid/management/ManagementBroker.cpp
@@ -494,7 +494,7 @@ void ManagementBroker::handleMethodRequestLH (Buffer& inBuffer, string replyToKe
 
         if (!acl->authorise(userId, acl::ACCESS, acl::METHOD, methodName, &params)) {
             outBuffer.putLong(Manageable::STATUS_FORBIDDEN);
-            outBuffer.putShortString(Manageable::StatusText(Manageable::STATUS_FORBIDDEN));
+            outBuffer.putMediumString(Manageable::StatusText(Manageable::STATUS_FORBIDDEN));
             outLen = MA_BUFFER_SIZE - outBuffer.available();
             outBuffer.reset();
             sendBuffer(outBuffer, outLen, dExchange, replyToKey);
@@ -505,12 +505,12 @@ void ManagementBroker::handleMethodRequestLH (Buffer& inBuffer, string replyToKe
     ManagementObjectMap::iterator iter = managementObjects.find(objId);
     if (iter == managementObjects.end() || iter->second->isDeleted()) {
         outBuffer.putLong        (Manageable::STATUS_UNKNOWN_OBJECT);
-        outBuffer.putShortString (Manageable::StatusText (Manageable::STATUS_UNKNOWN_OBJECT));
+        outBuffer.putMediumString(Manageable::StatusText (Manageable::STATUS_UNKNOWN_OBJECT));
     } else {
         if ((iter->second->getPackageName() != packageName) ||
             (iter->second->getClassName()   != className)) {
             outBuffer.putLong        (Manageable::STATUS_INVALID_PARAMETER);
-            outBuffer.putShortString (Manageable::StatusText (Manageable::STATUS_INVALID_PARAMETER));
+            outBuffer.putMediumString(Manageable::StatusText (Manageable::STATUS_INVALID_PARAMETER));
         }
         else
             try {
@@ -519,7 +519,7 @@ void ManagementBroker::handleMethodRequestLH (Buffer& inBuffer, string replyToKe
             } catch(std::exception& e) {
                 outBuffer.restore();
                 outBuffer.putLong(Manageable::STATUS_EXCEPTION);
-                outBuffer.putShortString(e.what());
+                outBuffer.putMediumString(e.what());
             }
     }
 
@@ -926,7 +926,7 @@ bool ManagementBroker::authorizeAgentMessageLH(Message& msg)
 
             encodeHeader(outBuffer, 'm', sequence);
             outBuffer.putLong(Manageable::STATUS_FORBIDDEN);
-            outBuffer.putShortString(Manageable::StatusText(Manageable::STATUS_FORBIDDEN));
+            outBuffer.putMediumString(Manageable::StatusText(Manageable::STATUS_FORBIDDEN));
             outLen = MA_BUFFER_SIZE - outBuffer.available();
             outBuffer.reset();
             sendBuffer(outBuffer, outLen, dExchange, replyToKey);
-- 
cgit v1.2.1