Removed processShutdownSignal/2 in ChannelN

to avoid unnecessary confusion.

Author: Hubert Plociniczak

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

@@ -224,7 +224,9 @@ public synchronized void quiescingRpc(Method m, RpcContinuation k)
      * @param notifyRpc the flag indicating whether any remaining rpc continuation should be
      *                  notified with the given signal
      */
-    public void processShutdownSignal(ShutdownSignalException signal, boolean ignoreClosed, boolean notifyRpc) {
+    public void processShutdownSignal(ShutdownSignalException signal,
+                                      boolean ignoreClosed,
+                                      boolean notifyRpc) {
         try {
             synchronized (this) {
                 if (!ignoreClosed)
@@ -238,16 +240,6 @@ public void processShutdownSignal(ShutdownSignalException signal, boolean ignore
         }
     }
 
-    /**
-     * Protected API - respond, in the driver thread, to a {@link ShutdownSignalException}.
-     * The method behaves in the same way as processShutdownSignal(ShutdownSignalException, boolean, boolean)
-     * with the only difference that any continuing rpc is always notified of the shutdown signal.
-     * @param signal the signal to handle
-     */
-    public void processShutdownSignal(ShutdownSignalException signal, boolean ignoreClosed) {
-        processShutdownSignal(signal, ignoreClosed, true);
-    }
-    
     public void notifyOutstandingRpc(ShutdownSignalException signal) {
         RpcContinuation k = nextOutstandingRpc();
         if (k != null) {

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

@@ -68,7 +68,7 @@ public void handleSignal(ShutdownSignalException signal) {
         }
         for (AMQChannel channel : channels) {
             disconnectChannel(channel.getChannelNumber());
-            channel.processShutdownSignal(signal, true);
+            channel.processShutdownSignal(signal, true, true);
         }
     }
 

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

@@ -145,8 +145,11 @@ public void broadcastShutdownSignal(ShutdownSignalException signal) {
      * Protected API - overridden to broadcast the signal to all
      * consumers before calling the superclass's method.
      */
-    @Override public void processShutdownSignal(ShutdownSignalException signal, boolean ignoreClosed) {
-        super.processShutdownSignal(signal, ignoreClosed);
+    @Override public void processShutdownSignal(ShutdownSignalException signal,
+                                                boolean ignoreClosed,
+                                                boolean notifyRpc)
+    {
+        super.processShutdownSignal(signal, ignoreClosed, notifyRpc);
         broadcastShutdownSignal(signal);
     }
 
@@ -222,7 +225,7 @@ public void releaseChannelNumber() {
                                                                              command,
                                                                              this);
                 synchronized(this) {
-                    processShutdownSignal(signal, true);
+                    processShutdownSignal(signal, true, true);
                     quiescingTransmit(new Channel.CloseOk());
                 }
                 notifyListeners();
@@ -285,7 +288,7 @@ public void close(int closeCode,
         // Synchronize the block below to avoid race conditions in case
         // connnection wants to send Connection-CloseOK
         synchronized(this) {
-            processShutdownSignal(signal, !initiatedByApplication);
+            processShutdownSignal(signal, !initiatedByApplication, true);
             quiescingRpc(reason, k);
         }