Merged revisions 533704-533720,533722-533763,533766-533818,533820-533839,533841-533859,533862-534112,534114-534117 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r533704 | bhupendrab | 2007-04-30 12:37:59 +0100 (Mon, 30 Apr 2007) | 1 line
  
  Added time-out for secure server connection.
........
  r534036 | ritchiem | 2007-05-01 13:28:03 +0100 (Tue, 01 May 2007) | 1 line
  
  QPID-461 Update to CommitRollbackTest. Ensuring messages received have the correct redelivered value, regardless of order. Different test case also was problematic.
........
  r534117 | ritchiem | 2007-05-01 16:22:17 +0100 (Tue, 01 May 2007) | 4 lines
  
  Comments and Test changes
  VirtualHost Added comments
  HeapExhaustion - Updated to send transient messages.
  QpidClientConnection - Allowed specification of type of message to send. 
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@534856 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 27 insertions, 7 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
index 8aaa760537..0e718da19b 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
@@ -359,17 +359,37 @@ public class CommitRollbackTest extends TestCase
 
         _logger.info("receiving result");
         Message result = _consumer.receive(1000);
-        assertNotNull("test message was consumed and rolled back, but is gone", result);
-        assertEquals("1", ((TextMessage) result).getText());
-        assertTrue("Messasge is not marked as redelivered", result.getJMSRedelivered());
 
-        result = _consumer.receive(1000);
         assertNotNull("test message was consumed and rolled back, but is gone", result);
-        assertEquals("2", ((TextMessage) result).getText());
-        assertTrue("Messasge is not marked as redelivered", result.getJMSRedelivered());
+
+
+        if (((TextMessage) result).getText().equals("2"))
+        {
+            assertTrue("Messasge is marked as redelivered", !result.getJMSRedelivered());
+
+            result = _consumer.receive(1000);
+            assertEquals("1", ((TextMessage) result).getText());
+            assertTrue("Messasge is not marked as redelivered", result.getJMSRedelivered());
+        }
+        else
+        {
+            assertEquals("1", ((TextMessage) result).getText());
+            assertTrue("Messasge is not marked as redelivered", result.getJMSRedelivered());
+            result = _consumer.receive(1000);
+            assertNotNull("test message was consumed and rolled back, but is gone", result);
+            assertEquals("2", ((TextMessage) result).getText());
+            assertTrue("Messasge is not marked as redelivered", result.getJMSRedelivered());
+        }
 
         result = _consumer.receive(1000);
 
+        if (result != null)
+        {
+            assertEquals("2", ((TextMessage) result).getText());
+            assertTrue("Messasge is not marked as redelivered", result.getJMSRedelivered());
+            result = _consumer.receive(1000);
+        }
+
         assertNull("test message should be null", result);
     }
 
@@ -411,7 +431,7 @@ public class CommitRollbackTest extends TestCase
         else // or it will be msg 2 arriving the first time due to latency.  
         {
             _logger.info("Message 2 wasn't prefetched so wasn't rejected");
-            assertEquals("2", ((TextMessage) result).getText());            
+            assertEquals("2", ((TextMessage) result).getText());
         }
 
         result = _consumer.receive(1000);