diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2008-02-21 20:42:21 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2008-02-21 20:42:21 +0000 |
| commit | a62a5b1d74ea7b45778911e83d69f3e9197042b7 (patch) | |
| tree | 1a618233dd40eda43302839a1052069cbe1d5c06 | |
| parent | 4de65ffd6c94b6a1bfa88793c8315b2b2707d49e (diff) | |
| download | qpid-python-a62a5b1d74ea7b45778911e83d69f3e9197042b7.tar.gz | |
QPID-804 : Fix Java Broker Python test failures
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@629981 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | java/broker/pom.xml | 2 | ||||
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/java/broker/pom.xml b/java/broker/pom.xml index b27ab657b7..1dd613e5f9 100644 --- a/java/broker/pom.xml +++ b/java/broker/pom.xml @@ -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"> diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java b/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java index 60c1a8f574..e6377b33da 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java +++ b/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java @@ -51,7 +51,7 @@ class ExchangeBindings 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 @@ class ExchangeBindings 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 @@ class ExchangeBindings } ExchangeBinding eb = (ExchangeBinding) o; return _exchange.equals(eb._exchange) - && _routingKey.equals(eb._routingKey) - && _arguments.equals(eb._arguments); + && _routingKey.equals(eb._routingKey); } } |