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/12 17:25:34 UTC

qpid-dispatch git commit: DISPATCH-329: Prevent javascript error when clicking on line between node and client

Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 3f5c33211 -> 6b89f2a9b


DISPATCH-329: Prevent javascript error when clicking on line between node and client


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/6b89f2a9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/6b89f2a9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/6b89f2a9

Branch: refs/heads/master
Commit: 6b89f2a9bf90f408979ff0222a7334fa7bdfef0b
Parents: 3f5c332
Author: Ernest Allen <ea...@redhat.com>
Authored: Thu May 12 13:25:13 2016 -0400
Committer: Ernest Allen <ea...@redhat.com>
Committed: Thu May 12 13:25:13 2016 -0400

----------------------------------------------------------------------
 console/hawtio/src/main/webapp/plugin/js/qdrTopology.js | 2 +-
 console/stand-alone/plugin/js/qdrTopology.js            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6b89f2a9/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 7e10547..be945f7 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
@@ -929,7 +929,7 @@ var QDR = (function (QDR) {
 						|| linkTypeIndex < 0 || nameIndex < 0 || linkDirIndex < 0)
 						return;
 					links.results.forEach ( function (link) {
-						if (link[connectionIdIndex] == root.obj[identityIndex] && link[linkTypeIndex] == root.obj[roleIndex])
+						if (root.obj && link[connectionIdIndex] == root.obj[identityIndex] && link[linkTypeIndex] == root.obj[roleIndex])
 							root.children.push (
 								{ name: "(" + link[linkDirIndex] + ") " + link[nameIndex],
 								size: 100,

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6b89f2a9/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 13da88a..75b8b6e 100644
--- a/console/stand-alone/plugin/js/qdrTopology.js
+++ b/console/stand-alone/plugin/js/qdrTopology.js
@@ -1158,7 +1158,7 @@ var QDR = (function (QDR) {
 						|| linkTypeIndex < 0 || nameIndex < 0 || linkDirIndex < 0)
 						return;
 					links.results.forEach ( function (link) {
-						if (link[connectionIdIndex] == root.obj[identityIndex] && link[linkTypeIndex] == root.obj[roleIndex])
+						if (root.obj && link[connectionIdIndex] == root.obj[identityIndex] && link[linkTypeIndex] == root.obj[roleIndex])
 							root.children.push (
 								{ name: "(" + link[linkDirIndex] + ") " + link[nameIndex],
 								size: 100,


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org