merge bug21773 into default

Author: Matthias Radestock

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

@@ -232,14 +232,6 @@ public void start(boolean insist)
         ml.start();
 
         try {
-            // See bug 17389. The MainLoop could have shut down already in
-            // which case we don't want to wait forever for a reply.
-        
-            // There is no race if the MainLoop shuts down after enqueuing
-            // the RPC because if that happens the channel will correctly
-            // pass the exception into RPC, waking it up.
-            ensureIsOpen();
-        
             AMQP.Connection.Start connStart =
                 (AMQP.Connection.Start) connStartBlocker.getReply().getMethod();
 

test/src/com/rabbitmq/client/test/BrokenFramesTest.java

@@ -77,8 +77,9 @@ public void testNoMethod() throws Exception {
         frames.add(new Frame(AMQP.FRAME_HEADER, 0));
         myFrameHandler.setFrames(frames.iterator());
 
+        AMQConnection conn = new AMQConnection(params, myFrameHandler);
         try {
-            new AMQConnection(params, myFrameHandler).start(false);
+            conn.start(false);
         } catch (IOException e) {
             UnexpectedFrameError unexpectedFrameError = findUnexpectedFrameError(e);
             assertNotNull(unexpectedFrameError);