summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2010-02-18 04:11:08 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2010-02-18 04:11:08 +0000
commitd5b17ae77f3f21ef52066c52f3d3251f17e74f66 (patch)
tree8e8a530f23064a7c1f9947e78b8864b210f0076a
parent655587154f0e45ccbb076a4e900f93afc5c344d2 (diff)
downloadqpid-python-d5b17ae77f3f21ef52066c52f3d3251f17e74f66.tar.gz
added a null check for the exchange class - related to QPID-1831
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@911249 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
index 018613800c..6ea338a667 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
@@ -1024,7 +1024,8 @@ public class AMQSession_0_10 extends AMQSession<BasicMessageConsumer_0_10, Basic
if (match && assertNode)
{
- match = (result.getDurable() == dest.isDurable()) &&
+ match = (result.getDurable() == dest.isDurable()) &&
+ (dest.getExchangeClass() != null) &&
(dest.getExchangeClass().asString().equals(result.getType())) &&
(matchProps(result.getArguments(),dest.getQueueOptions()));
}