Merging bug 21238 into default

Author: Matthew Sackman

src/com/rabbitmq/client/impl/AMQChannel.java

@@ -123,6 +123,11 @@ public static IOException wrap(ShutdownSignalException ex) {
         return ioe;
     }
 
+    public static IOException wrap(ShutdownSignalException ex, String message) {
+        IOException ioe = new IOException(message, ex);
+        return ioe;
+    }
+
     /**
      * Placeholder until we address bug 15786 (implementing a proper exception hierarchy).
      */

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -299,8 +299,13 @@ public void start(boolean insist)
             new AMQImpl.Connection.StartOk(_clientProperties, "PLAIN",
                                            saslResponse, "en_US");
 
-        AMQP.Connection.Tune connTune =
-            (AMQP.Connection.Tune) _channel0.exnWrappingRpc(startOk).getMethod();
+        AMQP.Connection.Tune connTune = null;
+
+        try {
+            connTune = (AMQP.Connection.Tune) _channel0.rpc(startOk).getMethod();
+        } catch (ShutdownSignalException e) {
+            throw AMQChannel.wrap(e, "Possibly caused by authentication failure");
+        }
 
         int channelMax =
             negotiatedMaxValue(factory.getRequestedChannelMax(),

test/src/com/rabbitmq/client/test/server/Permissions.java

@@ -138,6 +138,21 @@ protected void withNames(WithName action)
         action.with("read");
     }
 
+    public void testAuth()
+    {
+        ConnectionFactory unAuthFactory = new ConnectionFactory();
+        unAuthFactory.setUsername("test");
+        unAuthFactory.setPassword("tset");
+
+        try {
+            unAuthFactory.newConnection();
+            fail("Exception expected if password is wrong");
+        } catch (IOException e) {
+            String msg = e.getMessage();
+            assertTrue("Exception message should contain auth", msg.toLowerCase().contains("auth"));
+        }
+    }
+
     public void testExchangeConfiguration()
         throws IOException
     {