QPID-5884 : The broker should not NPE if it receives a SASL Init request where no mechanism is provided

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1612284 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 2 deletions

diff --git a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
index ea7c61e4ab..75b0d7be19 100644
--- a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
@@ -851,14 +851,14 @@ public class ConnectionEndpoint implements DescribedTypeConstructorRegistry.Sour
 
     public void receiveSaslInit(final SaslInit saslInit)
     {
-        Symbol mechanism = saslInit.getMechanism();
+        String mechanism = saslInit.getMechanism() == null ? null : saslInit.getMechanism().toString();
         final Binary initialResponse = saslInit.getInitialResponse();
         byte[] response = initialResponse == null ? new byte[0] : initialResponse.getArray();
 
 
         try
         {
-            _saslServer = _saslServerProvider.getSaslServer(mechanism.toString(), "localhost");
+            _saslServer = _saslServerProvider.getSaslServer(mechanism, "localhost");
 
             // Process response from the client
             byte[] challenge = _saslServer.evaluateResponse(response != null ? response : new byte[0]);