You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2009/05/19 18:34:23 UTC
svn commit: r776378 - in /qpid/trunk/qpid/java:
client/src/main/java/org/apache/qpid/client/
systests/src/main/java/org/apache/qpid/test/client/
Author: rhs
Date: Tue May 19 16:34:22 2009
New Revision: 776378
URL: http://svn.apache.org/viewvc?rev=776378&view=rev
Log:
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
Added:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java?rev=776378&r1=776377&r2=776378&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java Tue May 19 16:34:22 2009
@@ -396,10 +396,9 @@
public void releaseForRollback()
{
- if (_dispatcher != null)
- {
- _dispatcher.rollback();
- }
+ startDispatcherIfNecessary();
+ syncDispatchQueue();
+ _dispatcher.rollback();
getQpidSession().messageRelease(_txRangeSet, Option.SET_REDELIVERED);
_txRangeSet.clear();
_txSize = 0;
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java?rev=776378&r1=776377&r2=776378&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java Tue May 19 16:34:22 2009
@@ -430,4 +430,31 @@
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();
+ }
+ }
}
Added: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java?rev=776378&view=auto
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java (added)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java Tue May 19 16:34:22 2009
@@ -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();
+ }
+
+}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org