[jboss-cvs] JBoss Messaging SVN: r2943 - in trunk: tests/src/org/jboss/test/messaging/jms/message and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2007-07-31 18:14:26 -0400 (Tue, 31 Jul 2007)
New Revision: 2943

Modified:
   trunk/src/main/org/jboss/jms/message/JBossMessage.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java
Log:
Fix on JMSXDeliveryCount

Modified: trunk/src/main/org/jboss/jms/message/JBossMessage.java
===================================================================
--- trunk/src/main/org/jboss/jms/message/JBossMessage.java	2007-07-31 21:11:27 UTC (rev 2942)
+++ trunk/src/main/org/jboss/jms/message/JBossMessage.java	2007-07-31 22:14:26 UTC (rev 2943)
@@ -568,7 +568,8 @@
 
    public boolean propertyExists(String name) throws JMSException
    {
-      return headers.containsKey(PROPERTY_PREFIX + name);
+      return headers.containsKey(PROPERTY_PREFIX + name)
+             || name.equals("JMSXDeliveryCount");
    }
 
    public boolean getBooleanProperty(String name) throws JMSException

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java	2007-07-31 21:11:27 UTC (rev 2942)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java	2007-07-31 22:14:26 UTC (rev 2943)
@@ -118,13 +118,17 @@
 	      TextMessage tm = (TextMessage)c.receive(1000);
 	
 	      assertEquals("xoxo", tm.getText());
-	      assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
+         assertTrue("JMSXDeliveryCount is supposed to exist as a property",
+                     tm.propertyExists("JMSXDeliveryCount"));
+         assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
 	
 	      s.recover();
 	
 	      tm = (TextMessage)c.receive(1000);
 	
 	      assertEquals("xoxo", tm.getText());
+         assertTrue("JMSXDeliveryCount is supposed to exist as a property",
+                     tm.propertyExists("JMSXDeliveryCount"));
 	      assertEquals(2, tm.getIntProperty("JMSXDeliveryCount"));
 	      
 	      tm.acknowledge();
@@ -180,6 +184,8 @@
 	            tm = (TextMessage)cons.receive(3000);
 	            assertNotNull(tm);
 	            assertEquals("testing" + i, tm.getText());
+               assertTrue("JMSXDeliveryCount is supposed to exist as a property",
+                           tm.propertyExists("JMSXDeliveryCount"));
 	            assertEquals(j + 1, tm.getIntProperty("JMSXDeliveryCount"));
 	         }
 	         if (j != NUM_RECOVERIES -1)
@@ -292,6 +298,8 @@
          
          assertEquals(tm.getText(), rm.getText());
          
+         assertTrue("JMSXDeliveryCount is supposed to exist as a property",
+                     tm.propertyExists("JMSXDeliveryCount"));
          assertEquals(1, rm.getIntProperty("JMSXDeliveryCount"));
          
          assertFalse(rm.getJMSRedelivered());