svn commit: r707653 - in /incubator/qpid/trunk/qpid: cpp/managementgen/qmf/schema.py cpp/src/qpid/agent/ManagementAgentImpl.cpp cpp/src/qpid/management/ManagementBroker.cpp python/qpid/management.py python/qpid/qmfconsole.py

[tross]

Author: tross
Date: Fri Oct 24 08:15:59 2008
New Revision: 707653

URL: http://svn.apache.org/viewvc?rev=707653&view=rev
Log:
Use a str16 instead of str8 for qmf method response text

Modified:
    incubator/qpid/trunk/qpid/cpp/managementgen/qmf/schema.py
    incubator/qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementBroker.cpp
    incubator/qpid/trunk/qpid/python/qpid/management.py
    incubator/qpid/trunk/qpid/python/qpid/qmfconsole.py

Modified: incubator/qpid/trunk/qpid/cpp/managementgen/qmf/schema.py
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/managementgen/qmf/schema.py?rev=707653&r1=707652&r2=707653&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/managementgen/qmf/schema.py (original)
+++ incubator/qpid/trunk/qpid/cpp/managementgen/qmf/schema.py Fri Oct 24 
08:15:59 2008
@@ -1076,7 +1076,7 @@
       stream.write ("        status = coreObject->ManagementMethod (METHOD_" +\
                     method.getName().upper() + ", ioArgs, text);\n")
       stream.write ("        outBuf.putLong        (status);\n")
-      stream.write ("        outBuf.putShortString 
(::qpid::management::Manageable::StatusText (status, text));\n")
+      stream.write ("        
outBuf.putMediumString(::qpid::management::Manageable::StatusText (status, 
text));\n")
       for arg in method.args:
         if arg.getDir () == "O" or arg.getDir () == "IO":
           stream.write ("        " +\

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp?rev=707653&r1=707652&r2=707653&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp 
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp Fri 
Oct 24 08:15:59 2008
@@ -370,13 +370,13 @@
 
     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 @@
             } catch(std::exception& e) {
                 outBuffer.restore();
                 outBuffer.putLong(Manageable::STATUS_EXCEPTION);
-                outBuffer.putShortString(e.what());
+                outBuffer.putMediumString(e.what());
             }
     }
 

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementBroker.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementBroker.cpp?rev=707653&r1=707652&r2=707653&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementBroker.cpp 
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementBroker.cpp Fri 
Oct 24 08:15:59 2008
@@ -494,7 +494,7 @@
 
         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 @@
     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 @@
             } catch(std::exception& e) {
                 outBuffer.restore();
                 outBuffer.putLong(Manageable::STATUS_EXCEPTION);
-                outBuffer.putShortString(e.what());
+                outBuffer.putMediumString(e.what());
             }
     }
 
@@ -926,7 +926,7 @@
 
             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);

Modified: incubator/qpid/trunk/qpid/python/qpid/management.py
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/qpid/management.py?rev=707653&r1=707652&r2=707653&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/qpid/management.py (original)
+++ incubator/qpid/trunk/qpid/python/qpid/management.py Fri Oct 24 08:15:59 2008
@@ -534,7 +534,7 @@
 
   def handleMethodReply (self, ch, codec, sequence):
     status = codec.read_uint32 ()
-    sText  = str (codec.read_str8 ())
+    sText  = str (codec.read_str16 ())
 
     data = self.seqMgr.release (sequence)
     if data == None:

Modified: incubator/qpid/trunk/qpid/python/qpid/qmfconsole.py
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/qpid/qmfconsole.py?rev=707653&r1=707652&r2=707653&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/qpid/qmfconsole.py (original)
+++ incubator/qpid/trunk/qpid/python/qpid/qmfconsole.py Fri Oct 24 08:15:59 2008
@@ -460,7 +460,7 @@
 
   def _handleMethodResp(self, broker, codec, seq):
     code = codec.read_uint32()
-    text = str(codec.read_str8())
+    text = str(codec.read_str16())
     outArgs = {}
     method, synchronous = self.seqMgr._release(seq)
     if code == 0: