summaryrefslogtreecommitdiff
path: root/qpid/tools
diff options
context:
space:
mode:
authorFraser Adams <fadams@apache.org>2014-07-05 14:50:08 +0000
committerFraser Adams <fadams@apache.org>2014-07-05 14:50:08 +0000
commita455595aa92f7d21e7406fb2c09726239be0b395 (patch)
tree591689051864f13e992cc2d9882525f70c13e4a2 /qpid/tools
parent02235e597ba5e62a135b721acc14fea223c0df56 (diff)
downloadqpid-python-a455595aa92f7d21e7406fb2c09726239be0b395.tar.gz
JIRA:QPID-5820 Added some defensive code to qmf-ui.js to protect against the case when null binding arguments get returned. Fixed bug in broker-core BindingImpl.java whereby the binding arguments were not being set on construction which caused getArguments to always return null
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1608025 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/tools')
-rw-r--r--qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
index b59099a797..4c24b44dbb 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
@@ -2384,7 +2384,8 @@ qmfui.Bindings = new function() {
*/
var render = function(exchange, binding) {
if (exchange.type == "headers") {
- var arguments = binding.arguments;
+ // Arguments *should* be returned, but set to empty object if not to protect subsequent code.
+ var arguments = binding.arguments ? binding.arguments : {"x-match": "any"};
var headers = "<p class='title'>x-match: " + arguments["x-match"] + "</p>";
for (var key in arguments) {
if (key != "x-match") {