correct exceptions for waitForConfirms

The two waitForConfirms can fail with exceptions in only two cases: 1)
when something happened to the underlying channel, we just throw
channel exception to the caller without wrapping it, and 2) when
waitForConfirmsOrDie received a nack, we throw an IOException("nacks
received").

The test is for the first case.  Since we don't have a way to cause a
nack, we can't test for the second case.

Author: Alexandru Scvortov

src/com/rabbitmq/client/Channel.java

@@ -703,7 +703,7 @@ void basicNack(long deliveryTag, boolean multiple, boolean requeue)
      * non-Confirm channel, waitForConfirms returns true immediately.
      * @return whether all the messages were ack'd (and none were nack'd)
      */
-    boolean waitForConfirms() throws IOException, InterruptedException;
+    boolean waitForConfirms() throws InterruptedException;
 
     /** Wait until all messages published since the last call have
      * been either ack'd or nack'd by the broker.  If any of the

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

@@ -166,12 +166,12 @@ public ConfirmListener getConfirmListener() {
 
     /** {@inheritDoc} */
     public boolean waitForConfirms()
-        throws IOException, InterruptedException
+        throws InterruptedException
     {
         synchronized (unconfirmedSet) {
             while (true) {
                 if (getCloseReason() != null) {
-                    throw new IOException(Utility.fixStackTrace(getCloseReason()));
+                    throw Utility.fixStackTrace(getCloseReason());
                 }
                 if (unconfirmedSet.isEmpty()) {
                     boolean aux = onlyAcksReceived;
@@ -188,9 +188,8 @@ public void waitForConfirmsOrDie()
         throws IOException, InterruptedException
     {
         if (!waitForConfirms()) {
-            close(AMQP.REPLY_SUCCESS, "NACKS RECEIVED", true,
-                  new RuntimeException("received nack"), false);
-            throw new IOException(Utility.fixStackTrace(getCloseReason()));
+            close(AMQP.REPLY_SUCCESS, "NACKS RECEIVED", true, null, false);
+            throw new IOException("nacks received");
         }
     }
 

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

@@ -23,8 +23,10 @@
 import com.rabbitmq.client.DefaultConsumer;
 import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.MessageProperties;
+import com.rabbitmq.client.ShutdownSignalException;
 import com.rabbitmq.client.test.BrokerTestCase;
 
+
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
@@ -261,9 +263,9 @@ public void testWaitForConfirmsException()
         try {
             channel.waitForConfirmsOrDie();
             fail("waitAcks worked on a closed channel");
-        } catch (IOException ioe) {
-            if (ioe.getCause() == null || !(ioe.getCause() instanceof RuntimeException))
-                fail("got the wrong exception :(");
+        } catch (ShutdownSignalException sse) {
+            if (!(sse.getReason() instanceof AMQP.Channel.Close))
+                fail("didn't except for the right reason");
             //whoosh; everything ok
         } catch (InterruptedException e) {
             // whoosh; we should probably re-run, though