merge bug18997 into default

Author: Matthias Radestock

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

@@ -585,14 +585,13 @@ public void shutdown(Object reason,
         try {
             synchronized (this) {
                 ensureIsOpen(); // invariant: we should never be shut down more than once per instance
-                _shutdownCause = new ShutdownSignalException(true,
+                ShutdownSignalException sse = new ShutdownSignalException(true,
                                                              initiatedByApplication,
                                                              reason, this);
+                sse.initCause(cause);
+                _shutdownCause = sse;
             }
 
-            if (cause != null) {
-                _shutdownCause.initCause(cause);
-            }
             _channel0.processShutdownSignal(_shutdownCause);
         } catch (AlreadyClosedException ace) {
             if (initiatedByApplication)