1 files changed, 71 insertions, 0 deletions
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java
new file mode 100644
index 0000000000..0f12c8c7e6
--- /dev/null
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java
@@ -0,0 +1,71 @@
+/*
+ *
+ * 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.client.redelivered;
+
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
+
+import javax.jms.Connection;
+import javax.jms.Destination;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.Session;
+
+public class RedeliveredMessageTest extends QpidBrokerTestCase
+{
+    private Connection _connection;
+
+    public void setUp() throws Exception
+    {
+        super.setUp();
+        _connection = getConnection();
+    }
+
+    public void testRedeliveredFlagOnSessionClose() throws Exception
+    {
+        Session session = _connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+        Destination destination = session.createQueue(getTestQueueName());
+        MessageConsumer consumer = session.createConsumer(destination);
+
+        final int numberOfMessages = 3;
+        sendMessage(session, destination, numberOfMessages);
+
+        _connection.start();
+
+        for(int i = 0; i < numberOfMessages; i++)
+        {
+            final Message m = consumer.receive(1000l);
+            assertNotNull("Message is not recieved at " + i, m);
+            assertFalse("Redelivered should be not set", m.getJMSRedelivered());
+        }
+
+        session.close();
+        session = _connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+        destination = session.createQueue(getTestQueueName());
+        consumer = session.createConsumer(destination);
+
+        for(int i = 0; i < numberOfMessages; i++)
+        {
+            final Message m = consumer.receive(1000l);
+            assertNotNull("Message is not recieved at " + i, m);
+            assertTrue("Redelivered should be set", m.getJMSRedelivered());
+        }
+    }
+}