QPID-846 : Update to prevent JMSX* values being masked, updated JMSPropertiesTest to prevent regression.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@636347 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 33 insertions, 8 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
index 83ca82df5c..6d4c61fb29 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
@@ -394,15 +394,10 @@ public abstract class AbstractJMSMessage extends AMQMessage implements org.apach
     public String getStringProperty(String propertyName) throws JMSException
     {
 
-        if (propertyName.startsWith("JMSX"))
+        //NOTE: if the JMSX Property is a non AMQP property then we must check _strictAMQP and throw as below.
+        if (propertyName.equals(CustomJMSXProperty.JMSXUserID.toString()))
         {
-            //NOTE: if the JMSX Property is a non AMQP property then we must check _strictAMQP and throw as below.
-            if (propertyName.equals(CustomJMSXProperty.JMSXUserID.toString()))
-            {
-                return ((BasicContentHeaderProperties) _contentHeaderProperties).getUserIdAsString();
-            }
-
-            return null;
+            return ((BasicContentHeaderProperties) _contentHeaderProperties).getUserIdAsString();
         }
         else
         {
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
index 86f6f13156..f2655adc98 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
@@ -38,6 +38,7 @@ import javax.jms.MessageProducer;
 import javax.jms.ObjectMessage;
 import javax.jms.Queue;
 import javax.jms.Session;
+import java.util.Enumeration;
 
 /**
  * @author Apache Software Foundation
@@ -85,6 +86,12 @@ public class JMSPropertiesTest extends TestCase
         sentMsg.setJMSType(JMS_TYPE);
         sentMsg.setJMSReplyTo(JMS_REPLY_TO);
 
+        String JMSXGroupID_VALUE = "group";
+        sentMsg.setStringProperty("JMSXGroupID", JMSXGroupID_VALUE);
+        
+        int JMSXGroupSeq_VALUE = 1;
+        sentMsg.setIntProperty("JMSXGroupSeq", JMSXGroupSeq_VALUE);
+
         // send it
         producer.send(sentMsg);
 
@@ -103,6 +110,29 @@ public class JMSPropertiesTest extends TestCase
         assertEquals("JMS Reply To mismatch", sentMsg.getJMSReplyTo(), rm.getJMSReplyTo());
         assertTrue("JMSMessageID Does not start ID:", rm.getJMSMessageID().startsWith("ID:"));
 
+        //Validate that the JMSX values are correct
+        assertEquals("JMSXGroupID is not as expected:", JMSXGroupID_VALUE, rm.getStringProperty("JMSXGroupID"));
+        assertEquals("JMSXGroupSeq is not as expected:", JMSXGroupSeq_VALUE, rm.getIntProperty("JMSXGroupSeq"));
+
+        boolean JMSXGroupID_Available = false;
+        boolean JMSXGroupSeq_Available = false;
+        Enumeration props = con.getMetaData().getJMSXPropertyNames();
+        while (props.hasMoreElements())
+        {
+            String name = (String) props.nextElement();
+            if (name.equals("JMSXGroupID"))
+            {
+                JMSXGroupID_Available = true;
+            }
+            if (name.equals("JMSXGroupSeq"))
+            {
+                JMSXGroupSeq_Available = true;
+            }
+        }
+
+        assertTrue("JMSXGroupID not available.",JMSXGroupID_Available);
+        assertTrue("JMSXGroupSeq not available.",JMSXGroupSeq_Available);
+
         con.close();
     }