1 files changed, 7 insertions, 6 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java b/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
index 7ea4416f3b..ca10126aa7 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
@@ -30,16 +30,19 @@ import javax.jms.TextMessage;
 
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import org.apache.qpid.client.transport.TransportConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class AMQQueueDeferredOrderingTest extends QpidBrokerTestCase
 {
+
+    private static final int NUM_MESSAGES = 1000;
+
     private Connection con;
     private Session session;
     private AMQQueue queue;
     private MessageConsumer consumer;
-    private int numMessages;
 
     private static final Logger _logger = LoggerFactory.getLogger(AMQQueueDeferredOrderingTest.class);
 
@@ -85,8 +88,6 @@ public class AMQQueueDeferredOrderingTest extends QpidBrokerTestCase
     {
         super.setUp();
 
-        numMessages = isBrokerStorePersistent() ? 300 : 1000;
-
         _logger.info("Create Connection");
         con = getConnection();
         _logger.info("Create Session");
@@ -105,19 +106,19 @@ public class AMQQueueDeferredOrderingTest extends QpidBrokerTestCase
 
         // Setup initial messages
         _logger.info("Creating first producer thread");
-        producerThread = new ASyncProducer(queue, 0, numMessages / 2);
+        producerThread = new ASyncProducer(queue, 0, NUM_MESSAGES / 2);
         producerThread.start();
         // Wait for them to be done
         producerThread.join();
 
         // Setup second set of messages to produce while we consume
         _logger.info("Creating second producer thread");
-        producerThread = new ASyncProducer(queue, numMessages / 2, numMessages);
+        producerThread = new ASyncProducer(queue, NUM_MESSAGES / 2, NUM_MESSAGES);
         producerThread.start();
 
         // Start consuming and checking they're in order
         _logger.info("Consuming messages");
-        for (int i = 0; i < numMessages; i++)
+        for (int i = 0; i < NUM_MESSAGES; i++)
         {
             Message msg = consumer.receive(3000);
             assertNotNull("Message should not be null", msg);