Attachment 917432 Details for Bug 693721 – Makes new field optional and fixes qpid-tool display

[patch] Makes new field optional and fixes qpid-tool display

bz693721.patch (text/plain), 3.73 KB, created by Ernie on 2014-07-11 21:18:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ernie

Created: 2014-07-11 21:18:31 UTC

Size: 3.73 KB

patch

obsolete

>diff --git a/qpid/cpp/src/qpid/broker/SessionState.cpp b/qpid/cpp/src/qpid/broker/SessionState.cpp
>index fca5b4f..63484d7 100644
>--- a/qpid/cpp/src/qpid/broker/SessionState.cpp
>+++ b/qpid/cpp/src/qpid/broker/SessionState.cpp
>@@ -69,8 +69,12 @@ void SessionState::addManagementObject() {
>     if (parent != 0) {
>         ManagementAgent* agent = getBroker().getManagementAgent();
>         if (agent != 0) {
>-            mgmtObject = _qmf::Session::shared_ptr(new _qmf::Session
>-                (agent, this, parent, getId().getName()));
>+            std::string name(getId().getName());
>+            std::string fullName(name);
>+            if (name.length() >= std::numeric_limits<uint8_t>::max())
>+                name.resize(std::numeric_limits<uint8_t>::max()-1);
>+            mgmtObject = _qmf::Session::shared_ptr(new _qmf::Session                           (agent, this, parent, name));
>+            mgmtObject->set_fullName (fullName);
>             mgmtObject->set_attached (0);
>             mgmtObject->set_detachedLifespan (0);
>             mgmtObject->clr_expireTime();
>diff --git a/qpid/cpp/src/qpid/broker/amqp/ManagedSession.cpp b/qpid/cpp/src/qpid/broker/amqp/ManagedSession.cpp
>index 5917ddb..fcccfae 100644
>--- a/qpid/cpp/src/qpid/broker/amqp/ManagedSession.cpp
>+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedSession.cpp
>@@ -36,7 +36,12 @@ ManagedSession::ManagedSession(Broker& broker, ManagedConnection& p, const std::
> {
>     qpid::management::ManagementAgent* agent = broker.getManagementAgent();
>     if (agent != 0) {
>-        session = _qmf::Session::shared_ptr(new _qmf::Session(agent, this, broker.GetVhostObject(), id));
>+        std::string name(id);
>+        std::string fullName(name);
>+        if (name.length() >= std::numeric_limits<uint8_t>::max())
>+            name.resize(std::numeric_limits<uint8_t>::max()-1);
>+        session = _qmf::Session::shared_ptr(new _qmf::Session(agent, this, broker.GetVhostObject(), name));
>+        session->set_fullName(fullName);
>         session->set_attached(true);
>         session->set_detachedLifespan(0);
>         session->clr_expireTime();
>@@ -468,7 +468,7 @@ void AsynchIO::readable(DispatchHandle& h) {
>diff --git a/qpid/python/qpid/disp.py b/qpid/python/qpid/disp.py
>index c29ea00..d1340b8 100644
>--- a/qpid/python/qpid/disp.py
>+++ b/qpid/python/qpid/disp.py
>@@ -151,8 +151,8 @@ class Display:
>     print line
>     line = self.tablePrefix
>     for width in colWidth:
>-      for i in range (width):
>-        line = line + "="
>+      line = line + "=" * width
>+    line = line[:255]
>     print line
> 
>     for row in rows:
>diff --git a/qpid/specs/management-schema.xml b/qpid/specs/management-schema.xml
>index a0feba2..af27d8b 100644
>--- a/qpid/specs/management-schema.xml
>+++ b/qpid/specs/management-schema.xml
>@@ -510,6 +510,7 @@
>   <class name="Session">
>     <property name="vhostRef"         type="objId"   references="Vhost" access="RC" index="y" parentRef="y"/>
>     <property name="name"             type="sstr"    access="RC" index="y"/>
>+    <property name="fullName"         type="lstr"    access="RO" optional="y"/>
>     <property name="channelId"        type="uint16"  access="RO"/>
>     <property name="connectionRef"    type="objId"   references="Connection" access="RO"/>
>     <property name="detachedLifespan" type="uint32"  access="RO" unit="second"/>
>diff --git a/qpid/tools/src/py/qpidtoollibs/disp.py b/qpid/tools/src/py/qpidtoollibs/disp.py
>index 21e09f8..1b7419b 100644
>--- a/qpid/tools/src/py/qpidtoollibs/disp.py
>+++ b/qpid/tools/src/py/qpidtoollibs/disp.py
>@@ -182,8 +182,8 @@ class Display:
>     print line
>     line = self.tablePrefix
>     for width in colWidth:
>-      for i in range (width):
>-        line = line + "="
>+      line = line + "=" * width
>+    line = line[:255]
>     print line
> 
>     for row in rows:

Actions: View | Diff

Attachments on bug 693721: 912417 | 917427 | 917432 | 918411