more specific check for exceptions

Also, throw the exception we say we're throwing.

Author: Alexandru Scvortov

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

@@ -193,7 +193,7 @@ public boolean waitForConfirms()
         synchronized (unconfirmedSet) {
             while (true) {
                 if (getCloseReason() != null) {
-                    throw Utility.fixStackTrace(getCloseReason());
+                    throw new IOException(Utility.fixStackTrace(getCloseReason()));
                 }
                 if (unconfirmedSet.isEmpty()) {
                     boolean noNacksReceived = !nacksReceived;
@@ -212,7 +212,7 @@ public void waitForConfirmsOrDie()
         if (!waitForConfirms()) {
             close(AMQP.REPLY_SUCCESS, "OK", true,
                   new RuntimeException("received nack"), false);
-            throw Utility.fixStackTrace(getCloseReason());
+            throw new IOException(Utility.fixStackTrace(getCloseReason()));
         }
     }
 

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

@@ -261,8 +261,10 @@ public void testWaitForConfirmsException()
         try {
             channel.waitForConfirmsOrDie();
             fail("waitAcks worked on a closed channel");
-        } catch (Exception e) {
+        } catch (IOException e) {
             //whoosh; everything ok
+        } catch (InterruptedException e) {
+            // whoosh; we should probably re-run, though
         }
     }