Remove volatile on monitor protected vars;

Move testPersistentMandatory() to front of Confirm test-suite;
Make confirmTest and publish methods private in Confirm test-suite;
Move confirm test-stuie to front of FunctionalTests suite list.

Author: Steve Powell

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

@@ -88,14 +88,14 @@ public class ChannelN extends AMQChannel implements com.rabbitmq.client.Channel
     /** Set of currently unconfirmed messages (i.e. messages that have
      *  not been ack'd or nack'd by the server yet.
      *  Used as monitor and protects nextPublishSeqNo and onlyAcksReceived. */
-    private volatile SortedSet<Long> unconfirmedSet =
+    private SortedSet<Long> unconfirmedSet =
             Collections.synchronizedSortedSet(new TreeSet<Long>());
     /** Sequence number of next published message requiring confirmation.
      * 0 means no confirmations. */
-    private volatile long nextPublishSeqNo = 0L;
+    private long nextPublishSeqNo = 0L;
     /** Whether any nacks have been received since the last
      * waitForConfirms(). */
-    private volatile boolean noNacksReceived = true;
+    private boolean noNacksReceived = true;
 
     /**
      * Construct a new channel on the given connection with the given
@@ -1036,7 +1036,7 @@ protected void handleAckNack(long seqNo, boolean multiple, boolean nack) {
             } else {
                 unconfirmedSet.remove(seqNo);
             }
-            noNacksReceived = noNacksReceived && !nack;
+            noNacksReceived &= !nack;
             if (unconfirmedSet.isEmpty())
                 unconfirmedSet.notifyAll();
         }

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

@@ -74,6 +74,13 @@ private void declareBindQueue(String queueName, boolean durable)
         channel.queueBind(queueName, "amq.direct", "confirm-multiple-queues");
     }
 
+    public void testPersistentMandatory()
+    throws Exception
+    {
+        declareConsumeQueue("confirm-test", true);
+        confirmTest("", "confirm-test", true, true, false);
+    }
+
     public void testTransient()
         throws Exception
     {
@@ -109,13 +116,6 @@ public void testPersistentImmediateNoConsumer()
         confirmTest("", "confirm-test-noconsumer", true, false, true);
     }
 
-    public void testPersistentMandatory()
-        throws Exception
-    {
-        declareConsumeQueue("confirm-test", true);
-        confirmTest("", "confirm-test", true, true, false);
-    }
-
     public void testPersistentMandatoryReturn()
         throws Exception
     {
@@ -309,9 +309,9 @@ public void testWaitForConfirmsException()
     }
 
     /* Publish NUM_MESSAGES messages and wait for confirmations. */
-    public void confirmTest(String exchange, String queueName,
-                            boolean persistent, boolean mandatory,
-                            boolean immediate)
+    private void confirmTest(String exchange, String queueName,
+                             boolean persistent, boolean mandatory,
+                             boolean immediate)
         throws Exception
     {
         publishN(exchange, queueName, persistent, mandatory, immediate);
@@ -342,10 +342,11 @@ private void basicRejectCommon(String queueName, boolean requeue)
         }
     }
 
-    protected void publish(String exchangeName, String queueName,
+    private void publish(String exchangeName, String queueName,
                            boolean persistent, boolean mandatory,
                            boolean immediate)
-        throws Exception {
+        throws Exception
+    {
         channel.basicPublish(exchangeName, queueName, mandatory, immediate,
                              persistent ? MessageProperties.PERSISTENT_BASIC
                                         : MessageProperties.BASIC,

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

@@ -24,6 +24,7 @@
 public class FunctionalTests extends TestCase {
     public static TestSuite suite() {
         TestSuite suite = new TestSuite("functional");
+        suite.addTestSuite(Confirm.class);
         suite.addTestSuite(ConnectionOpen.class);
         suite.addTestSuite(Heartbeat.class);
         suite.addTestSuite(Tables.class);
@@ -52,7 +53,6 @@ public static TestSuite suite() {
         suite.addTestSuite(InvalidAcksTx.class);
         suite.addTestSuite(DefaultExchange.class);
         suite.addTestSuite(UnbindAutoDeleteExchange.class);
-        suite.addTestSuite(Confirm.class);
         suite.addTestSuite(ConsumerCancelNotificiation.class);
         suite.addTestSuite(UnexpectedFrames.class);
         suite.addTestSuite(PerQueueTTL.class);