summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2010-01-13 03:15:06 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2010-01-13 03:15:06 +0000
commit26280399738211de3f472b625091ff22c762538b (patch)
tree9443fce290f657b5e6109b1edc6d42756ed88a4a
parente4fea782693b2951aeabfabdb176897919dbe1b4 (diff)
downloadqpid-python-26280399738211de3f472b625091ff22c762538b.tar.gz
Added a null check for SASL client in the connectionOpenOk method
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@898634 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
index 8828d30f52..5e67b822db 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
@@ -178,7 +178,7 @@ public class ClientDelegate extends ConnectionDelegate
@Override public void connectionOpenOk(Connection conn, ConnectionOpenOk ok)
{
SaslClient sc = conn.getSaslClient();
- if (sc.getMechanismName().equals("GSSAPI") && getUserID() != null)
+ if (sc != null && sc.getMechanismName().equals("GSSAPI") && getUserID() != null)
{
conn.setUserID(getUserID());
}