diff options
| author | Fraser Adams <fadams@apache.org> | 2014-07-05 14:50:08 +0000 |
|---|---|---|
| committer | Fraser Adams <fadams@apache.org> | 2014-07-05 14:50:08 +0000 |
| commit | a455595aa92f7d21e7406fb2c09726239be0b395 (patch) | |
| tree | 591689051864f13e992cc2d9882525f70c13e4a2 /qpid | |
| parent | 02235e597ba5e62a135b721acc14fea223c0df56 (diff) | |
| download | qpid-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')
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java | 2 | ||||
| -rw-r--r-- | qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java index c0ce78ead9..2115ac9ba0 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java @@ -71,7 +71,7 @@ public class BindingImpl _queue = queue; _exchange = exchange; - + setArguments((Map<String, Object>)getActualAttributes().get(ARGUMENTS)); } @Override 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") { |