From 58862bc7348b1348de8545d9a4abc6b07b3fb4cb Mon Sep 17 00:00:00 2001
From: Rajith Muditha Attapattu <rajith@apache.org>
Date: Thu, 18 Feb 2010 04:11:08 +0000
Subject: added a null check for the exchange class - related to QPID-1831

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@911249 13f79535-47bb-0310-9956-ffa450edef68
---
 java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'java/client')

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
index 018613800c..6ea338a667 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
+++ b/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()));
         }
-- 
cgit v1.2.1