From 7a2d5a4b76fdfd2dc40b0110abd16b37e374a108 Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Fri, 29 Jan 2010 04:15:36 +0000 Subject: added a null check for connection settings git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@904375 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/transport/network/ConnectionBinding.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'java/common/src') diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/ConnectionBinding.java b/java/common/src/main/java/org/apache/qpid/transport/network/ConnectionBinding.java index b9f8c29dde..c14fe1fdb3 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/network/ConnectionBinding.java +++ b/java/common/src/main/java/org/apache/qpid/transport/network/ConnectionBinding.java @@ -72,7 +72,8 @@ public abstract class ConnectionBinding { Connection conn = connection(); - if (conn.getConnectionSettings().isUseSASLEncryption()) + if (conn.getConnectionSettings() != null & + conn.getConnectionSettings().isUseSASLEncryption()) { sender = new SASLSender(sender); conn.addConnectionListener((ConnectionListener)sender); @@ -86,7 +87,8 @@ public abstract class ConnectionBinding public Receiver receiver(Connection conn) { - if (conn.getConnectionSettings().isUseSASLEncryption()) + if (conn.getConnectionSettings() != null & + conn.getConnectionSettings().isUseSASLEncryption()) { SASLReceiver receiver = new SASLReceiver(new InputHandler(new Assembler(conn))); conn.addConnectionListener((ConnectionListener)receiver); -- cgit v1.2.1