QPID-5884 : The client should not send SASL Init frame where no mechanism is provided

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

1 files changed, 13 insertions, 0 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 75b0d7be19..5d6bc67373 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
@@ -938,6 +938,19 @@ public class ConnectionEndpoint implements DescribedTypeConstructorRegistry.Sour
         {
             init.setMechanism(SASL_EXTERNAL);
         }
+        else
+        {
+            synchronized (getLock())
+            {
+                _saslComplete = true;
+                _authenticated = false;
+                getLock().notifyAll();
+            }
+            setClosedForInput(true);
+            _saslFrameOutput.close();
+
+            return;
+        }
         _saslFrameOutput.send(new SASLFrame(init), null);
     }