From 86bfd7d89ab6ccdb6a57aa83c2379c4616e4f3f7 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Sun, 29 Jan 2012 16:38:29 +0000 Subject: 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/qpid@1237331 13f79535-47bb-0310-9956-ffa450edef68 --- .../client/src/main/java/org/apache/qpid/client/AMQDestination.java | 2 +- java/client/src/main/java/org/apache/qpid/client/AMQQueue.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'java/client/src/main') diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java b/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java index 2479f89b52..530186b1f9 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java +++ b/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/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java b/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java index c413f71906..4e9b53c814 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java +++ b/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; + } } -- cgit v1.2.1