Do not throw AlreadyClosedException

Author: Hubert Plociniczak

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

@@ -227,12 +227,11 @@ public synchronized void quiescingRpc(Method m, RpcContinuation k)
     public void processShutdownSignal(ShutdownSignalException signal, boolean ignoreClosed, boolean notifyRpc) {
         try {
             synchronized (this) {
-                ensureIsOpen(); // invariant: we should never be shut down more than once per instance
-                _shutdownCause = signal;
+                if (!ignoreClosed)
+                    ensureIsOpen(); // invariant: we should never be shut down more than once per instance
+                if (isOpen())
+                    _shutdownCause = signal;
             }
-        } catch (AlreadyClosedException ace) {
-            if (!ignoreClosed)
-                throw ace;
         } finally {
             if (notifyRpc)
                 notifyOutstandingRpc(signal);

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

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