Use less state

Author: Emile Joubert

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

@@ -83,8 +83,6 @@ public class ChannelN extends AMQChannel implements com.rabbitmq.client.Channel
     /** Sequence number of next published message requiring confirmation.*/
     private long nextPublishSeqNo = 0L;
 
-    private volatile boolean confirmSelected = false;
-
     /** The current default consumer, or null if there is none. */
     private volatile Consumer defaultConsumer = null;
 
@@ -177,7 +175,7 @@ public boolean waitForConfirms()
     /** {@inheritDoc} */
     public boolean waitForConfirms(long timeout)
             throws InterruptedException, TimeoutException {
-        if (!confirmSelected)
+        if (nextPublishSeqNo == 0L)
             throw new IllegalStateException("Confirms not selected");
         long startTime = System.currentTimeMillis();
         synchronized (unconfirmedSet) {
@@ -1052,7 +1050,6 @@ public Tx.RollbackOk txRollback()
     public Confirm.SelectOk confirmSelect()
         throws IOException
     {
-        confirmSelected = true;
         if (nextPublishSeqNo == 0) nextPublishSeqNo = 1;
         return (Confirm.SelectOk)
             exnWrappingRpc(new Confirm.Select(false)).getMethod();