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

1 files changed, 3 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
         {