Apply bug25509 on stable branch

Emile Joubert · Emile Joubert · commit 3f284094f5f2 · 2013-04-15T11:08:10.000+01:00
diff --git a/src/com/rabbitmq/client/impl/ChannelN.java b/src/com/rabbitmq/client/impl/ChannelN.java
@@ -469,7 +469,6 @@ private void callConfirmListeners(@SuppressWarnings("unused") Command command, B
     }
 
     private void asyncShutdown(Command command) throws IOException {
-        releaseChannel();
         ShutdownSignalException signal = new ShutdownSignalException(false,
                                                                      false,
                                                                      command,
@@ -479,6 +478,7 @@ private void asyncShutdown(Command command) throws IOException {
                 processShutdownSignal(signal, true, false);
                 quiescingTransmit(new Channel.CloseOk());
             } finally {
+                releaseChannel();
                 notifyOutstandingRpc(signal);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,6 @@ private void callConfirmListeners(@SuppressWarnings("unused") Command command, B`
`469`	`469`	`}`
`470`	`470`
`471`	`471`	`private void asyncShutdown(Command command) throws IOException {`
`472`		`- releaseChannel();`
`473`	`472`	`ShutdownSignalException signal = new ShutdownSignalException(false,`
`474`	`473`	`false,`
`475`	`474`	`command,`
`@@ -479,6 +478,7 @@ private void asyncShutdown(Command command) throws IOException {`
`479`	`478`	`processShutdownSignal(signal, true, false);`
`480`	`479`	`quiescingTransmit(new Channel.CloseOk());`
`481`	`480`	`} finally {`
	`481`	`+ releaseChannel();`
`482`	`482`	`notifyOutstandingRpc(signal);`
`483`	`483`	`}`
`484`	`484`	`}`