merge bug20296 into v1_5

rabbitmq · Feb 18, 2009 · bc2aadc · bc2aadc
2 parents a53866a + c9fed7f
commit bc2aadc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/com/rabbitmq/client/impl/ChannelN.java b/src/com/rabbitmq/client/impl/ChannelN.java
@@ -193,8 +193,12 @@ public void releaseChannelNumber() {
                                                                          command,
                                                                          this);
             synchronized (_channelMutex) {
-                processShutdownSignal(signal, true, true);
-                quiescingTransmit(new Channel.CloseOk());
+                try {
+                    processShutdownSignal(signal, true, false);
+                    quiescingTransmit(new Channel.CloseOk());
+                } finally {
+                    notifyOutstandingRpc(signal);
+                }
             }
             notifyListeners();
             return true;