summaryrefslogtreecommitdiff
path: root/java/broker
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2012-01-11 21:09:27 +0000
committerRobert Godfrey <rgodfrey@apache.org>2012-01-11 21:09:27 +0000
commit5e0d88fffe2ef0c08b6b6faa34e099924e38df83 (patch)
tree0baa3f6eb9c4fcd91eef7af1e4fb2b078b45b5d8 /java/broker
parent455cd59a5183e9e18bc47d7f0288636ecd5eec37 (diff)
downloadqpid-python-5e0d88fffe2ef0c08b6b6faa34e099924e38df83.tar.gz
QPID-3720 : Fix bug which causes failure in 0-9-1 tests, namely SimpleAMQQueue.QueueEntryListener assuming that all listeners are of the same type
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1230251 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker')
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index c5aee5dbe3..582f0ea5a2 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
@@ -2210,9 +2210,9 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener, Mes
public boolean equals(Object o)
{
- assert o != null;
- assert o instanceof QueueEntryListener;
- return _sub == ((QueueEntryListener) o)._sub;
+ return o != null
+ && o instanceof SimpleAMQQueue.QueueEntryListener
+ && _sub == ((QueueEntryListener) o)._sub;
}
public int hashCode()