Author: rgodfrey
Date: Sun Jan 29 16:38:29 2012
New Revision: 1237331
URL: http://svn.apache.org/viewvc?rev=1237331&view=rev
Log:
QPID-3789 : [Java] fix regression caused by destination cache miss (by further
screwing with equality on AMQDestination)
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java?rev=1237331&r1=1237330&r2=1237331&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
Sun Jan 29 16:38:29 2012
@@ -593,7 +593,7 @@ public abstract class AMQDestination imp
{
return true;
}
- if (o == null || getClass() != o.getClass())
+ if (!(o instanceof AMQDestination))
{
return false;
}
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java?rev=1237331&r1=1237330&r2=1237331&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
Sun Jan 29 16:38:29 2012
@@ -171,4 +171,10 @@ public class AMQQueue extends AMQDestina
//remain valid if we failover (see BLZ-24)
return getQueueName() == null;
}
+
+ @Override
+ public boolean equals(Object o)
+ {
+ return super.equals(o) && o instanceof Queue;
+ }
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
