And now implement it all this way instead, which is a fair bit nicer

Author: Matthew Sackman

src/com/rabbitmq/client/Channel.java

@@ -180,9 +180,6 @@ public interface Channel extends ShutdownNotifier {
      */
     void setDefaultConsumer(Consumer consumer);
 
-    ConsumerCancellationListener getConsumerCancellationListener();
-    void setConsumerCancellationListener(ConsumerCancellationListener notifier);
-
     /**
      * Request specific "quality of service" settings.
      *

src/com/rabbitmq/client/Consumer.java

@@ -82,4 +82,6 @@ void handleDelivery(String consumerTag,
                         AMQP.BasicProperties properties,
                         byte[] body)
         throws IOException;
+    
+    void handleCancelNotification() throws IOException;
 }

src/com/rabbitmq/client/DefaultConsumer.java

@@ -79,6 +79,10 @@ public void handleDelivery(String consumerTag,
             // no work to do
     }
 
+    public void handleCancelNotification() throws IOException {
+        // no work to do
+    }
+
     /**
     *  Retrieve the channel.
      * @return the channel this consumer is attached to.

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

@@ -91,8 +91,6 @@ public class ChannelN extends AMQChannel implements com.rabbitmq.client.Channel
      */
     public volatile ConfirmListener confirmListener = null;
 
-    public volatile ConsumerCancellationListener consumerCancellationListener = null;
-    
     /** Sequence number of next published message requiring confirmation.
      */
     private long nextPublishSeqNo = 0L;
@@ -178,15 +176,6 @@ public void setDefaultConsumer(Consumer consumer) {
         defaultConsumer = consumer;
     }
 
-    public ConsumerCancellationListener getConsumerCancellationListener() {
-        return consumerCancellationListener;
-    }
-
-    public void setConsumerCancellationListener(
-            ConsumerCancellationListener listener) {
-        consumerCancellationListener = listener;
-    }
-
     /**
      * Protected API - sends a ShutdownSignal to all active consumers.
      * @param signal an exception signalling channel shutdown
@@ -352,12 +341,20 @@ public void releaseChannelNumber() {
                 // so return false
                 return false;
             } else if (method instanceof Basic.Cancel) {
-                ConsumerCancellationListener l = getConsumerCancellationListener();
-                if (l != null) {
+                Basic.Cancel m = (Basic.Cancel)method;
+                Consumer callback = _consumers.get(m.consumerTag);
+                if (callback == null) {
+                    callback = defaultConsumer;
+                }
+                if (callback != null) {
                     try {
-                        l.handleConsumerCancellation(((Basic.Cancel)method).getConsumerTag());
+                        callback.handleCancelNotification();
                     } catch (Throwable ex) {
-                        _connection.getExceptionHandler().handleConsumerCancellationException(this, ex);
+                        _connection.getExceptionHandler().handleConsumerException(this,
+                                                                                  ex,
+                                                                                  callback,
+                                                                                  m.consumerTag,
+                                                                                  "handleCancelNotification");
                     }
                 }
                 return true;

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

@@ -79,5 +79,4 @@ void handleConsumerException(Channel channel,
                                  String consumerTag,
                                  String methodName);
 
-    void handleConsumerCancellationException(Channel channel, Throwable exception);
 }

test/src/com/rabbitmq/client/test/AMQConnectionTest.java

@@ -197,10 +197,6 @@ public void handleConsumerException(Channel ch,
             fail("handleConsumerException " + consumerTag + " " + methodName + ": " + ex);
         }
 
-        public void handleConsumerCancellationException(Channel channel, Throwable ex) {
-            fail("handleConsmuerCancellationException " + ex);
-        }
-
         public List<Throwable> getHandledExceptions() {
             return _handledExceptions;
         }