From f39a947903420da8022ee52dddbc6ad11c4f6def Mon Sep 17 00:00:00 2001
From: Rajith Muditha Attapattu <rajith@apache.org>
Date: Thu, 28 Jan 2010 15:21:26 +0000
Subject: Added a null check for connection as some test cases use mock
 sessions by passing null as the connection parameter

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

(limited to 'java/client')

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 5946d9096e..a9142ff4e4 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -425,7 +425,7 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
     protected AMQSession(AMQConnection con, int channelId, boolean transacted, int acknowledgeMode,
                MessageFactoryRegistry messageFactoryRegistry, int defaultPrefetchHighMark, int defaultPrefetchLowMark)
     {
-        USE_AMQP_ENCODED_MAP_MESSAGE = !con.isUseLegacyMapMessageFormat();  
+        USE_AMQP_ENCODED_MAP_MESSAGE = con == null ? true : !con.isUseLegacyMapMessageFormat();
         _strictAMQP = Boolean.parseBoolean(System.getProperties().getProperty(STRICT_AMQP, STRICT_AMQP_DEFAULT));
         _strictAMQPFATAL =
                 Boolean.parseBoolean(System.getProperties().getProperty(STRICT_AMQP_FATAL, STRICT_AMQP_FATAL_DEFAULT));
-- 
cgit v1.2.1