diff options
| -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") { |