Delay notifyOutstandingRpc() until after responding to channel.close …

…errors.
rabbitmq · Jan 28, 2011 · 4d8ba38 · 4d8ba38
1 parent 63d7a15
commit 4d8ba38
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/com/rabbitmq/client/impl/ChannelN.java b/src/com/rabbitmq/client/impl/ChannelN.java
@@ -357,9 +357,13 @@ private void asyncShutdown(Command command) throws IOException {
                                                                      false,
                                                                      command,
                                                                      this);
-        synchronized (_channelMutex) {
-            processShutdownSignal(signal, true, true);
-            quiescingTransmit(new Channel.CloseOk());
+        try {
+            synchronized (_channelMutex) {
+                processShutdownSignal(signal, true, false);
+                quiescingTransmit(new Channel.CloseOk());
+            }
+        } finally {
+            notifyOutstandingRpc(signal);
         }
         notifyListeners();
     }