Author: rgodfrey
Date: Tue Feb 21 10:43:47 2012
New Revision: 1291701
URL: http://svn.apache.org/viewvc?rev=1291701&view=rev
Log:
QPID-3597 : Python Headers Exchange tests fail against Java Broker (Java Broker
only removes headers bindings if debug is enabled)
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java?rev=1291701&r1=1291700&r2=1291701&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
Tue Feb 21 10:43:47 2012
@@ -251,10 +251,11 @@ public class HeadersExchange extends Abs
{
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);
}
}
Modified: qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes?rev=1291701&r1=1291700&r2=1291701&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes
(original)
+++ qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes Tue
Feb 21 10:43:47 2012
@@ -78,7 +78,6 @@ qpid_tests.broker_0_10.alternate_exchang
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
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
