diff options
author | Robert Godfrey <rgodfrey@apache.org> | 2012-01-29 16:38:29 +0000 |
---|---|---|
committer | Robert Godfrey <rgodfrey@apache.org> | 2012-01-29 16:38:29 +0000 |
commit | 98a611242810c00526ce903e45c44c4c176cc7e6 (patch) | |
tree | 069464f8067529bb99d030f7401acb7844c36f38 | |
parent | 8c1167ac57b774b43c881f72659db19b648b4441 (diff) | |
download | qpid-python-98a611242810c00526ce903e45c44c4c176cc7e6.tar.gz |
QPID-3789 : [Java] fix regression caused by destination cache miss (by further screwing with equality on AMQDestination)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237331 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java | 2 | ||||
-rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java index 2479f89b52..530186b1f9 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java @@ -593,7 +593,7 @@ public abstract class AMQDestination implements Destination, Referenceable { return true; } - if (o == null || getClass() != o.getClass()) + if (!(o instanceof AMQDestination)) { return false; } diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java index c413f71906..4e9b53c814 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java @@ -171,4 +171,10 @@ public class AMQQueue extends AMQDestination implements Queue //remain valid if we failover (see BLZ-24) return getQueueName() == null; } + + @Override + public boolean equals(Object o) + { + return super.equals(o) && o instanceof Queue; + } } |