You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2008/02/21 21:42:22 UTC
svn commit: r629981 - in /incubator/qpid/branches/M2.1/java/broker: pom.xml
src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java
Author: rgodfrey
Date: Thu Feb 21 12:42:21 2008
New Revision: 629981
URL: http://svn.apache.org/viewvc?rev=629981&view=rev
Log:
QPID-804 : Fix Java Broker Python test failures
Modified:
incubator/qpid/branches/M2.1/java/broker/pom.xml
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java
Modified: incubator/qpid/branches/M2.1/java/broker/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/pom.xml?rev=629981&r1=629980&r2=629981&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/pom.xml (original)
+++ incubator/qpid/branches/M2.1/java/broker/pom.xml Thu Feb 21 12:42:21 2008
@@ -248,7 +248,7 @@
</condition>
<property name="command"
- value="python run-tests -v -I java_failing.txt -b localhost:2110"/>
+ value="python run-tests -v -I java_failing.txt -b localhost:2110 -s ../specs/amqp.0-9.no-wip.xml"/>
<!--value="bash -c 'python run-tests -v -I java_failing.txt'"/>-->
<ant antfile="python-test.xml" inheritRefs="true">
Modified: incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java?rev=629981&r1=629980&r2=629981&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java (original)
+++ incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java Thu Feb 21 12:42:21 2008
@@ -51,7 +51,7 @@
ExchangeBinding(AMQShortString routingKey, Exchange exchange, FieldTable arguments)
{
- _routingKey = routingKey;
+ _routingKey = routingKey == null ? AMQShortString.EMPTY_STRING : routingKey;
_exchange = exchange;
_arguments = arguments == null ? EMPTY_ARGUMENTS : arguments;
}
@@ -74,8 +74,7 @@
public int hashCode()
{
return (_exchange == null ? 0 : _exchange.hashCode())
- + (_routingKey == null ? 0 : _routingKey.hashCode())
- + (_arguments == null ? 0 : _arguments.hashCode());
+ + (_routingKey == null ? 0 : _routingKey.hashCode());
}
public boolean equals(Object o)
@@ -86,8 +85,7 @@
}
ExchangeBinding eb = (ExchangeBinding) o;
return _exchange.equals(eb._exchange)
- && _routingKey.equals(eb._routingKey)
- && _arguments.equals(eb._arguments);
+ && _routingKey.equals(eb._routingKey);
}
}