diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2012-02-21 10:43:47 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2012-02-21 10:43:47 +0000 |
| commit | 70c5ef6729ab5b5042a132cb086fe04ba31cd86b (patch) | |
| tree | ce7c001b010428465949eaa26b2a56ef03e588c9 /java | |
| parent | b3221db80e19526b609b95ef5b00ce5ef29d8268 (diff) | |
| download | qpid-python-70c5ef6729ab5b5042a132cb086fe04ba31cd86b.tar.gz | |
QPID-3597 : Python Headers Exchange tests fail against Java Broker (Java Broker only removes headers bindings if debug is enabled)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1291701 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java | 5 | ||||
| -rw-r--r-- | java/test-profiles/python_tests/Java010PythonExcludes | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java index de12da74b4..7e320956b6 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java +++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java @@ -251,10 +251,11 @@ public class HeadersExchange extends AbstractExchange { bindings.remove(binding); } - + + boolean removedBinding = _bindingHeaderMatchers.remove(new HeadersBinding(binding)); if(_logger.isDebugEnabled()) { - _logger.debug("Removing Binding: " + _bindingHeaderMatchers.remove(new HeadersBinding(binding))); + _logger.debug("Removing Binding: " + removedBinding); } } diff --git a/java/test-profiles/python_tests/Java010PythonExcludes b/java/test-profiles/python_tests/Java010PythonExcludes index 91a04cc4d2..4e39c18797 100644 --- a/java/test-profiles/python_tests/Java010PythonExcludes +++ b/java/test-profiles/python_tests/Java010PythonExcludes @@ -78,7 +78,6 @@ qpid_tests.broker_0_10.alternate_exchange.AlternateExchangeTests.test_add_altern qpid_tests.broker_0_10.new_api.GeneralTests.test_qpid_3481_acquired_to_alt_exchange #QPID-3597 Headers exchange issues -qpid_tests.broker_0_10.queue.QueueTests.test_unbind_headers qpid_tests.broker_0_10.exchange.RecommendedTypesRuleTests.testHeaders qpid_tests.broker_0_10.exchange.RequiredInstancesRuleTests.testAmqMatch qpid_tests.broker_0_10.query.QueryTests.test_exchange_bound_header |