[jboss-cvs] JBoss Messaging SVN: r3148 - in trunk: tests/src/org/jboss/test/messaging/jms/message and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 27 16:11:36 EDT 2007
Author: clebert.suconic at jboss.com
Date: 2007-09-27 16:11:36 -0400 (Thu, 27 Sep 2007)
New Revision: 3148
Modified:
trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java
trunk/tests/src/org/jboss/test/messaging/jms/message/BytesMessageTest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/MapMessageTest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java
trunk/tests/src/org/jboss/test/messaging/jms/message/ObjectMessageTest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/StreamMessageTest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignBytesMessageTest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignMapMessageTest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignObjectMessageTest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignStreamMessageTest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignTextMessageTest.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-1079 - calling resets on redeliveries (fix on ClientConsumer)
Modified: trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java 2007-09-27 19:12:12 UTC (rev 3147)
+++ trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java 2007-09-27 20:11:36 UTC (rev 3148)
@@ -634,6 +634,11 @@
proxy.setSessionDelegate(sessionDelegate, isConnectionConsumer);
+
+ // In some redelivery scenarios, a ByteMessage or StreamMessages needs to be reset
+ // so, this call is also being made here (not just when the message is is sent)
+ proxy.getMessage().doBeforeSend();
+
//Add it to the buffer
buffer.addLast(proxy, proxy.getJMSPriority());
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/BytesMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/BytesMessageTest.java 2007-09-27 19:12:12 UTC (rev 3147)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/BytesMessageTest.java 2007-09-27 20:11:36 UTC (rev 3148)
@@ -84,9 +84,9 @@
bm.reset();
}
- protected void assertEquivalent(Message m, int mode) throws JMSException
+ protected void assertEquivalent(Message m, int mode, boolean redelivered) throws JMSException
{
- super.assertEquivalent(m, mode);
+ super.assertEquivalent(m, mode, redelivered);
BytesMessage bm = (BytesMessage)m;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/MapMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/MapMessageTest.java 2007-09-27 19:12:12 UTC (rev 3147)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/MapMessageTest.java 2007-09-27 20:11:36 UTC (rev 3148)
@@ -105,9 +105,9 @@
mm.setString("string", "this is a string");
}
- protected void assertEquivalent(Message m, int mode) throws JMSException
+ protected void assertEquivalent(Message m, int mode, boolean redelivery) throws JMSException
{
- super.assertEquivalent(m, mode);
+ super.assertEquivalent(m, mode, redelivery);
MapMessage mm = (MapMessage)m;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java 2007-09-27 19:12:12 UTC (rev 3147)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java 2007-09-27 20:11:36 UTC (rev 3148)
@@ -50,11 +50,11 @@
protected Connection conn;
protected Session session;
-
+
protected MessageProducer queueProd;
-
+
protected MessageConsumer queueCons;
-
+
// Constructors --------------------------------------------------
public MessageTestBase(String name)
@@ -70,7 +70,7 @@
conn = cf.createConnection();
session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
+
queueProd = session.createProducer(queue1);
queueCons = session.createConsumer(queue1);
@@ -120,6 +120,39 @@
assertEquivalent(r, DeliveryMode.PERSISTENT);
}
+ public void testRedelivery() throws Exception
+ {
+ prepareMessage(message);
+
+ session.close();
+ session = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+
+ queueProd = session.createProducer(queue1);
+ queueProd.setDeliveryMode(DeliveryMode.PERSISTENT);
+ queueCons = session.createConsumer(queue1);
+
+ queueProd.send(message);
+
+ Message r = queueCons.receive(500);
+
+ assertEquivalent(r, DeliveryMode.PERSISTENT);
+
+ queueCons.close();
+ session.close();
+
+ session = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+ queueCons = session.createConsumer(queue1);
+ r = queueCons.receive(1000);
+
+ assertEquivalent(r, DeliveryMode.PERSISTENT, true);
+
+ r.acknowledge();
+
+ assertNull(queueCons.receive(100));
+
+
+ }
+
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
@@ -140,8 +173,15 @@
m.setJMSType("someArbitraryType");
}
- protected void assertEquivalent(Message m, int mode) throws JMSException
+
+ private void assertEquivalent(Message m, int mode) throws JMSException
{
+ assertEquivalent(m, mode, false);
+ }
+
+ protected void assertEquivalent(Message m, int mode, boolean redelivered) throws JMSException
+ {
+ assertNotNull(m);
assertEquals(true, m.getBooleanProperty("booleanProperty"));
assertEquals((byte)3, m.getByteProperty("byteProperty"));
assertEquals(new Double(4.0), new Double(m.getDoubleProperty("doubleProperty")));
@@ -155,7 +195,7 @@
assertEquals(topic1, m.getJMSReplyTo());
assertEquals("someArbitraryType", m.getJMSType());
assertEquals(queue1, m.getJMSDestination());
- assertFalse(m.getJMSRedelivered());
+ assertTrue(m.getJMSRedelivered() == redelivered);
assertEquals(mode, m.getJMSDeliveryMode());
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/ObjectMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/ObjectMessageTest.java 2007-09-27 19:12:12 UTC (rev 3147)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/ObjectMessageTest.java 2007-09-27 20:11:36 UTC (rev 3148)
@@ -122,9 +122,9 @@
}
- protected void assertEquivalent(Message m, int mode) throws JMSException
+ protected void assertEquivalent(Message m, int mode, boolean redelivery) throws JMSException
{
- super.assertEquivalent(m, mode);
+ super.assertEquivalent(m, mode, redelivery);
ObjectMessage om = (ObjectMessage)m;
assertEquals("this is the serializable object", om.getObject());
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/StreamMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/StreamMessageTest.java 2007-09-27 19:12:12 UTC (rev 3147)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/StreamMessageTest.java 2007-09-27 20:11:36 UTC (rev 3148)
@@ -99,9 +99,9 @@
sm.writeString("this is a String");
}
- protected void assertEquivalent(Message m, int mode) throws JMSException
+ protected void assertEquivalent(Message m, int mode, boolean redelivery) throws JMSException
{
- super.assertEquivalent(m, mode);
+ super.assertEquivalent(m, mode, redelivery);
StreamMessage sm = (StreamMessage)m;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java 2007-09-27 19:12:12 UTC (rev 3147)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java 2007-09-27 20:11:36 UTC (rev 3148)
@@ -85,9 +85,9 @@
tm.setText("this is the payload");
}
- protected void assertEquivalent(Message m, int mode) throws JMSException
+ protected void assertEquivalent(Message m, int mode, boolean redelivery) throws JMSException
{
- super.assertEquivalent(m, mode);
+ super.assertEquivalent(m, mode, redelivery);
TextMessage tm = (TextMessage)m;
assertEquals("this is the payload", tm.getText());
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignBytesMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignBytesMessageTest.java 2007-09-27 19:12:12 UTC (rev 3147)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignBytesMessageTest.java 2007-09-27 20:11:36 UTC (rev 3148)
@@ -55,9 +55,9 @@
return m;
}
- protected void assertEquivalent(Message m, int mode) throws JMSException
+ protected void assertEquivalent(Message m, int mode, boolean redelivery) throws JMSException
{
- super.assertEquivalent(m,mode);
+ super.assertEquivalent(m,mode, redelivery);
BytesMessage byteMsg = (BytesMessage)m;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignMapMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignMapMessageTest.java 2007-09-27 19:12:12 UTC (rev 3147)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignMapMessageTest.java 2007-09-27 20:11:36 UTC (rev 3148)
@@ -65,9 +65,9 @@
return m;
}
- protected void assertEquivalent(Message m, int mode) throws JMSException
+ protected void assertEquivalent(Message m, int mode, boolean redelivery) throws JMSException
{
- super.assertEquivalent(m,mode);
+ super.assertEquivalent(m,mode,redelivery);
MapMessage map = (MapMessage)m;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignObjectMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignObjectMessageTest.java 2007-09-27 19:12:12 UTC (rev 3147)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignObjectMessageTest.java 2007-09-27 20:11:36 UTC (rev 3148)
@@ -70,9 +70,9 @@
return m;
}
- protected void assertEquivalent(Message m, int mode) throws JMSException
+ protected void assertEquivalent(Message m, int mode, boolean redelivery) throws JMSException
{
- super.assertEquivalent(m,mode);
+ super.assertEquivalent(m,mode, redelivery);
ObjectMessage obj = (ObjectMessage)m;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignStreamMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignStreamMessageTest.java 2007-09-27 19:12:12 UTC (rev 3147)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignStreamMessageTest.java 2007-09-27 20:11:36 UTC (rev 3148)
@@ -65,9 +65,9 @@
return m;
}
- protected void assertEquivalent(Message m, int mode) throws JMSException
+ protected void assertEquivalent(Message m, int mode, boolean redelivery) throws JMSException
{
- super.assertEquivalent(m,mode);
+ super.assertEquivalent(m,mode, redelivery);
StreamMessage sm = (StreamMessage)m;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignTextMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignTextMessageTest.java 2007-09-27 19:12:12 UTC (rev 3147)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/foreign/ForeignTextMessageTest.java 2007-09-27 20:11:36 UTC (rev 3148)
@@ -52,9 +52,9 @@
return m;
}
- protected void assertEquivalent(Message m, int mode) throws JMSException
+ protected void assertEquivalent(Message m, int mode, boolean redelivery) throws JMSException
{
- super.assertEquivalent(m, mode);
+ super.assertEquivalent(m, mode, redelivery);
TextMessage tm = (TextMessage)m;
assertEquals("this is the payload", tm.getText());
More information about the jboss-cvs-commits
mailing list