Author: fadams
Date: Sat Jul 5 14:50:08 2014
New Revision: 1608025
URL: http://svn.apache.org/r1608025
Log:
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
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java?rev=1608025&r1=1608024&r2=1608025&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
Sat Jul 5 14:50:08 2014
@@ -71,7 +71,7 @@ public class BindingImpl
_queue = queue;
_exchange = exchange;
-
+ setArguments((Map<String,
Object>)getActualAttributes().get(ARGUMENTS));
}
@Override
Modified:
qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js?rev=1608025&r1=1608024&r2=1608025&view=diff
==============================================================================
---
qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
(original)
+++
qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
Sat Jul 5 14:50:08 2014
@@ -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") {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
