QPID-1864: sync the dispatch queue to make sure there are no messages in it before we rollback, and fix the ordering so that messages are released in queue order

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

3 files changed, 116 insertions, 4 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
index 34457d745f..1515a07507 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
@@ -396,10 +396,9 @@ public class AMQSession_0_10 extends AMQSession<BasicMessageConsumer_0_10, Basic
 
     public void releaseForRollback()
     {
-        if (_dispatcher != null)
-        {
-            _dispatcher.rollback();
-        }
+        startDispatcherIfNecessary();
+        syncDispatchQueue();
+        _dispatcher.rollback();
         getQpidSession().messageRelease(_txRangeSet, Option.SET_REDELIVERED);
         _txRangeSet.clear();
         _txSize = 0;
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
index 8b17dcf91f..1b2d6876bd 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
@@ -430,4 +430,31 @@ public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<UnprocessedM
         return receiveNoWait();
     }
 
+    @Override public void rollbackPendingMessages()
+    {
+        if (_synchronousQueue.size() > 0)
+        {
+            RangeSet ranges = new RangeSet();
+            Iterator iterator = _synchronousQueue.iterator();
+            while (iterator.hasNext())
+            {
+
+                Object o = iterator.next();
+                if (o instanceof AbstractJMSMessage)
+                {
+                    ranges.add((int) ((AbstractJMSMessage) o).getDeliveryTag());
+                    iterator.remove();
+                }
+                else
+                {
+                    _logger.error("Queue contained a :" + o.getClass()
+                                  + " unable to reject as it is not an AbstractJMSMessage. Will be cleared");
+                    iterator.remove();
+                }
+            }
+
+            _0_10session.getQpidSession().messageRelease(ranges, Option.SET_REDELIVERED);
+            clearReceiveQueue();
+        }
+    }
 }
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
new file mode 100644
index 0000000000..39e2b892a9
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
@@ -0,0 +1,86 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.test.client;
+
+import org.apache.qpid.test.utils.*;
+import javax.jms.*;
+
+
+/**
+ * RollbackOrderTest
+ *
+ */
+
+public class RollbackOrderTest extends QpidTestCase
+{
+
+    private Connection conn;
+    private Queue queue;
+    private Session ssn;
+    private MessageProducer prod;
+    private MessageConsumer cons;
+
+    @Override public void setUp() throws Exception
+    {
+        super.setUp();
+        conn = getConnection();
+        conn.start();
+        ssn = conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
+        queue = ssn.createQueue("rollback-order-test-queue");
+        prod = ssn.createProducer(queue);
+        cons = ssn.createConsumer(queue);
+        for (int i = 0; i < 5; i++)
+        {
+            TextMessage msg = ssn.createTextMessage("message " + (i+1));
+            prod.send(msg);
+        }
+        ssn.commit();
+    }
+
+    public void testOrderingAfterRollback() throws Exception
+    {
+        for (int i = 0; i < 10; i++)
+        {
+            TextMessage msg = (TextMessage) cons.receive();
+            assertEquals("message 1", msg.getText());
+            ssn.rollback();
+        }
+    }
+
+    @Override public void tearDown() throws Exception
+    {
+        while (true)
+        {
+            Message msg = cons.receiveNoWait();
+            if (msg == null)
+            {
+                break;
+            }
+            else
+            {
+                msg.acknowledge();
+            }
+        }
+        ssn.commit();
+        super.tearDown();
+    }
+
+}