summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/common/src/main/java/org/apache/qpid/transport/network/ConnectionBinding.java6
1 files changed, 4 insertions, 2 deletions
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<ByteBuffer> 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);