Backout changeset bbfc45f00750cfa5040af26df5d414a415c4ab19

Author: Steve Powell

src/com/rabbitmq/client/QueueingConsumer.java

@@ -42,7 +42,7 @@
  * ch1.{@link Channel#queueBind queueBind}(queueName, exchangeName, queueName);
  *
  * // Create the QueueingConsumer and have it consume from the queue
- * QueueingConsumer consumer = new {@link QueueingConsumer#QueueingConsumer(Channel) QueueingConsumer}(ch1);
+ * QueueingConsumer consumer = new {@link QueueingConsumer#QueueingConsumer QueueingConsumer}(ch1);
  * ch1.{@link Channel#basicConsume basicConsume}(queueName, false, consumer);
  *
  * // Process deliveries
@@ -54,7 +54,7 @@
  * </pre>
  *
  *
- * <p>For a more complete example, see LogTail in the <code>test/src/com/rabbitmq/examples</code>
+ * <p>For a more complete example, see LogTail in the test/src/com/rabbitmq/examples
  * directory of the source distribution.</p>
  * <p/>
  * <b>deprecated</b> <i><code>QueueingConsumer</code> was introduced to allow
@@ -121,6 +121,7 @@ public QueueingConsumer(Channel ch, BlockingQueue<Delivery> q) {
                                byte[] body)
         throws IOException
     {
+//        checkShutdown();
         this._queue.add(new Delivery(envelope, properties, body));
     }
 
@@ -163,6 +164,14 @@ public byte[] getBody() {
         }
     }
 
+    /**
+     * Check if we are in shutdown mode and if so throw an exception.
+     */
+    private void checkShutdown() {
+        if (_shutdown != null)
+            throw Utility.fixStackTrace(_shutdown);
+    }
+
     /**
      * If delivery is not POISON nor null, return it.
      * <p/>
@@ -198,7 +207,6 @@ private Delivery handle(Delivery delivery) {
      * @return the next message
      * @throws InterruptedException if an interrupt is received while waiting
      * @throws ShutdownSignalException if the connection is shut down while waiting
-     * @throws ConsumerCancelledException if this consumer is cancelled while waiting
      */
     public Delivery nextDelivery()
         throws InterruptedException, ShutdownSignalException, ConsumerCancelledException
@@ -212,7 +220,6 @@ public Delivery nextDelivery()
      * @return the next message or null if timed out
      * @throws InterruptedException if an interrupt is received while waiting
      * @throws ShutdownSignalException if the connection is shut down while waiting
-     * @throws ConsumerCancelledException if this consumer is cancelled while waiting
      */
     public Delivery nextDelivery(long timeout)
         throws InterruptedException, ShutdownSignalException, ConsumerCancelledException