You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ea...@apache.org on 2016/05/05 23:20:28 UTC
qpid-dispatch git commit: DISPATCH-310: Use router.id in place of
container.containerName
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 532c89741 -> c7f2bda7a
DISPATCH-310: Use router.id in place of container.containerName
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/c7f2bda7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/c7f2bda7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/c7f2bda7
Branch: refs/heads/master
Commit: c7f2bda7a5973bf916a48a1e595b4e0ab3f5514f
Parents: 532c897
Author: Ernest Allen <ea...@redhat.com>
Authored: Thu May 5 19:20:01 2016 -0400
Committer: Ernest Allen <ea...@redhat.com>
Committed: Thu May 5 19:20:01 2016 -0400
----------------------------------------------------------------------
console/hawtio/src/main/webapp/plugin/js/qdrTopology.js | 5 +++--
console/stand-alone/plugin/js/qdrTopology.js | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c7f2bda7/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
index 4f0f3e7..7b02eb6 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
@@ -597,8 +597,9 @@ var QDR = (function (QDR) {
var nodeIndex = 0;
var nodeInfo = QDRService.topology.nodeInfo();
for (var id in nodeInfo) {
- var node = nodeInfo[id];
- if (node['.container'].results[0][0] == _id)
+ var node = nodeInfo[id]['.router'];
+ // there should be only one router entity for each node
+ if (QDRService.valFor( node.attributeNames, node.results[0], "id") === _id)
return nodeIndex;
nodeIndex++
}
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c7f2bda7/console/stand-alone/plugin/js/qdrTopology.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrTopology.js b/console/stand-alone/plugin/js/qdrTopology.js
index a410753..6e7ba47 100644
--- a/console/stand-alone/plugin/js/qdrTopology.js
+++ b/console/stand-alone/plugin/js/qdrTopology.js
@@ -827,8 +827,9 @@ var QDR = (function (QDR) {
var nodeIndex = 0;
var nodeInfo = QDRService.topology.nodeInfo();
for (var id in nodeInfo) {
- var node = nodeInfo[id];
- if (node['.container'].results[0][0] == _id)
+ var node = nodeInfo[id]['.router'];
+ // there should be only one router entity for each node
+ if (QDRService.valFor( node.attributeNames, node.results[0], "id") === _id)
return nodeIndex;
nodeIndex++
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org