You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gm...@apache.org on 2017/01/13 21:45:42 UTC
qpid-dispatch git commit: DISPATCH-609 - Fixed array contents to
prevent duplicate attributes to be added to the response query
Repository: qpid-dispatch
Updated Branches:
refs/heads/master b42282efd -> 89895c52e
DISPATCH-609 - Fixed array contents to prevent duplicate attributes to be added to the response query
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/89895c52
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/89895c52
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/89895c52
Branch: refs/heads/master
Commit: 89895c52e40c79c4727642c9b1d1f70bd16a5db1
Parents: b42282e
Author: Ganesh Murthy <gm...@redhat.com>
Authored: Fri Jan 13 16:21:19 2017 -0500
Committer: Ganesh Murthy <gm...@redhat.com>
Committed: Fri Jan 13 16:44:56 2017 -0500
----------------------------------------------------------------------
src/router_core/agent.c | 2 +-
tools/qdstat | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/89895c52/src/router_core/agent.c
----------------------------------------------------------------------
diff --git a/src/router_core/agent.c b/src/router_core/agent.c
index a150667..fe1ecca 100644
--- a/src/router_core/agent.c
+++ b/src/router_core/agent.c
@@ -304,7 +304,7 @@ static void qdr_agent_set_columns(qdr_query_t *query,
}
}
- if (count == 1 && idx == 1)
+ if ((count == 1 && idx == 1) || idx==count)
query->columns[idx] = -1;
else
query->columns[idx+1] = -1;
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/89895c52/tools/qdstat
----------------------------------------------------------------------
diff --git a/tools/qdstat b/tools/qdstat
index b8ae9dc..b85e204 100755
--- a/tools/qdstat
+++ b/tools/qdstat
@@ -368,7 +368,7 @@ class BusManager(Node):
rows = []
cols = ('distribution', 'inProcess', 'subscriberCount', 'remoteCount',
'containerCount', 'deliveriesIngress', 'deliveriesEgress',
- 'deliveriesTransit', 'deliveriesToContainer', 'deliveriesFromContainer')
+ 'deliveriesTransit', 'deliveriesToContainer', 'deliveriesFromContainer', 'name')
objects = self.query('org.apache.qpid.dispatch.router.address', cols, limit=self.opts.limit)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org