merge bug19676 into default

Author: tonyg

src/com/rabbitmq/client/Channel.java

@@ -84,6 +84,23 @@ public interface Channel extends ShutdownNotifier{
      * @throws java.io.IOException if an error is encountered
      */
     void close(int closeCode, String closeMessage) throws IOException;
+    
+    /**
+     * Abort this channel with the {@link com.rabbitmq.client.AMQP#REPLY_SUCCESS} close code
+     * and message 'OK'.
+     * 
+     * Forces the channel to close and waits for the close operation to complete.
+     * Any encountered exceptions in the close operation are silently discarded.
+     */
+    void abort() throws IOException;
+    
+    /**
+     * Abort this channel.
+     * 
+     * Forces the channel to close and waits for the close operation to complete.
+     * Any encountered exceptions in the close operation are silently discarded.
+     */    
+    void abort(int closeCode, String closeMessage) throws IOException;
 
     /**
      * Return the current {@link ReturnListener}.

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

@@ -278,7 +278,19 @@ public void close()
     public void close(int closeCode, String closeMessage)
         throws IOException
     {
-        close(closeCode, closeMessage, true, null);
+        close(closeCode, closeMessage, true, null, false);
+    }
+    
+    public void abort()
+        throws IOException
+    {
+        abort(AMQP.REPLY_SUCCESS, "OK");
+    }
+    
+    public void abort(int closeCode, String closeMessage)
+        throws IOException
+    {
+        close(closeCode, closeMessage, true, null, true);
     }
 
     /**
@@ -289,7 +301,8 @@ public void close(int closeCode, String closeMessage)
     public void close(int closeCode,
                       String closeMessage,
                       boolean initiatedByApplication,
-                      Throwable cause)
+                      Throwable cause,
+                      boolean abort)
         throws IOException
     {
         // First, notify all our dependents that we are shutting down.
@@ -306,29 +319,38 @@ public void close(int closeCode,
         }
 
         BlockingRpcContinuation<AMQCommand> k = new SimpleBlockingRpcContinuation();
-        // Synchronize the block below to avoid race conditions in case
-        // connnection wants to send Connection-CloseOK
-        synchronized(this) {
-            processShutdownSignal(signal, !initiatedByApplication, true);
-            quiescingRpc(reason, k);
-        }
-        
+        boolean notify = false;
         try {
+            // Synchronize the block below to avoid race conditions in case
+            // connnection wants to send Connection-CloseOK
+            synchronized(this) {
+                processShutdownSignal(signal, !initiatedByApplication, true);
+                quiescingRpc(reason, k);
+            }
+            
             // Now that we're in quiescing state, channel.close was sent and
             // we wait for the reply. We ignore the result. (It's always
             // close-ok.)
+            notify = true;
             k.getReply(-1);
         } catch (TimeoutException ise) {
             // Will never happen since we wait infinitely
+        } catch (ShutdownSignalException sse) {
+            if (!abort)
+                throw sse;
+        } catch (IOException ioe) {
+            if (!abort)
+                throw ioe;
         } finally {
-        
-            // Now we know everything's been cleaned up and there should
-            // be no more surprises arriving on the wire. Release the
-            // channel number, and dissociate this ChannelN instance from
-            // our connection so that any further frames inbound on this
-            // channel can be caught as the errors they are.
-            releaseChannelNumber();
-            notifyListeners();
+            if (abort || notify) {
+                // Now we know everything's been cleaned up and there should
+                // be no more surprises arriving on the wire. Release the
+                // channel number, and dissociate this ChannelN instance from
+                // our connection so that any further frames inbound on this
+                // channel can be caught as the errors they are.
+                releaseChannelNumber();
+                notifyListeners();
+            }
         }
     }    
 

test/src/com/rabbitmq/client/test/functional/BrokerTestCase.java

@@ -29,7 +29,6 @@
 
 import junit.framework.TestCase;
 
-import com.rabbitmq.client.AlreadyClosedException;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
@@ -110,12 +109,7 @@ public void closeChannel()
         throws IOException
     {
         if (channel != null) {
-            try {
-                channel.close();
-            } catch (AlreadyClosedException ace) {
-                // The API is broken so we have to catch this here.
-                // See bug 19676.
-            }
+            channel.abort();
             channel = null;
         }
     }