[Jboss-cvs] JBoss Messaging SVN: r1354 - in branches/Branch_1_0: src/main/org/jboss/jms/message src/main/org/jboss/messaging/core/message tests/src/org/jboss/test/messaging/jms/message

[jboss-cvs-commits at lists.jboss.org]

Author: ovidiu.feodorov at jboss.com
Date: 2006-09-22 16:33:53 -0400 (Fri, 22 Sep 2006)
New Revision: 1354

Modified:
   branches/Branch_1_0/src/main/org/jboss/jms/message/JBossMessage.java
   branches/Branch_1_0/src/main/org/jboss/jms/message/MessageProxy.java
   branches/Branch_1_0/src/main/org/jboss/messaging/core/message/RoutableSupport.java
   branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java
Log:
JMSXDeliveryCount minor bug fixes

Modified: branches/Branch_1_0/src/main/org/jboss/jms/message/JBossMessage.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/message/JBossMessage.java	2006-09-22 19:47:06 UTC (rev 1353)
+++ branches/Branch_1_0/src/main/org/jboss/jms/message/JBossMessage.java	2006-09-22 20:33:53 UTC (rev 1354)
@@ -76,13 +76,9 @@
    private static final long serialVersionUID = 8341387096828690976L;
    
    public static final byte TYPE = 0;
-   
    private static final int QUEUE = 1;
-   
    private static final int TOPIC = 2;
-   
    private static final int TEMP_QUEUE = 3;
-   
    private static final int TEMP_TOPIC = 4;
 
    // Static --------------------------------------------------------

Modified: branches/Branch_1_0/src/main/org/jboss/jms/message/MessageProxy.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/message/MessageProxy.java	2006-09-22 19:47:06 UTC (rev 1353)
+++ branches/Branch_1_0/src/main/org/jboss/jms/message/MessageProxy.java	2006-09-22 20:33:53 UTC (rev 1354)
@@ -257,6 +257,10 @@
 
    public long getLongProperty(String name) throws JMSException
    {
+      if ("JMSXDeliveryCount".equals(name))
+      {
+         return deliveryCount;
+      }
       return message.getLongProperty(name);
    }
 
@@ -272,6 +276,10 @@
 
    public String getStringProperty(String name) throws JMSException
    {
+      if ("JMSXDeliveryCount".equals(name))
+      {
+         return Integer.toString(deliveryCount);
+      }
       return message.getStringProperty(name);
    }
 

Modified: branches/Branch_1_0/src/main/org/jboss/messaging/core/message/RoutableSupport.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/messaging/core/message/RoutableSupport.java	2006-09-22 19:47:06 UTC (rev 1353)
+++ branches/Branch_1_0/src/main/org/jboss/messaging/core/message/RoutableSupport.java	2006-09-22 20:33:53 UTC (rev 1354)
@@ -403,7 +403,7 @@
       this.timestamp = timestamp;
       this.priority = priority;
       this.deliveryCount = deliveryCount;
-      this.redelivered = deliveryCount >= 1;      
+      this.redelivered = deliveryCount >= 2;
       if (headers == null)
       {
          this.headers = new HashMap();

Modified: branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java
===================================================================
--- branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java	2006-09-22 19:47:06 UTC (rev 1353)
+++ branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java	2006-09-22 20:33:53 UTC (rev 1354)
@@ -89,7 +89,37 @@
       super.tearDown();
    }
 
+   public void testSimpleJMSXDeliverCount() throws Exception
+   {
+      Connection conn = cf.createConnection();
+      Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+      MessageProducer p = s.createProducer(queue);
+      p.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
 
+      p.send(s.createTextMessage("xoxo"));
+
+      s.close();
+
+      s = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+      MessageConsumer c = s.createConsumer(queue);
+
+      conn.start();
+
+      TextMessage tm = (TextMessage)c.receive(1000);
+
+      assertEquals("xoxo", tm.getText());
+      assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
+
+      s.recover();
+
+      tm = (TextMessage)c.receive(1000);
+
+      assertEquals("xoxo", tm.getText());
+      assertEquals(2, tm.getIntProperty("JMSXDeliveryCount"));
+
+      conn.close();
+   }
+
    public void testRedeliveryOnQueue() throws Exception
    {
       Connection conn = cf.createConnection();
@@ -124,7 +154,7 @@
             TextMessage tm = (TextMessage)cons.receive(3000);
             assertNotNull(tm);
             assertEquals("testing" + i, tm.getText());
-            assertEquals(j, tm.getIntProperty("JMSXDeliveryCount"));
+            assertEquals(j + 1, tm.getIntProperty("JMSXDeliveryCount"));
          }
          sess2.recover();
       }
@@ -235,9 +265,10 @@
                      failed = true;
                   }
 
-                  if (tm.getIntProperty("JMSXDeliveryCount") != j)
+                  if (tm.getIntProperty("JMSXDeliveryCount") != (j + 1))
                   {
-                     log.error("Delivery count not expected value:" + j + " actual:" + tm.getIntProperty("JMSXDeliveryCount"));;
+                     log.error("Delivery count not expected value:" + (j + 1) +
+                               " actual:" + tm.getIntProperty("JMSXDeliveryCount"));;
                      failed = true;
                   }
                }