2 files changed, 12 insertions, 8 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java b/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
index bfb7b6a9ce..e66ba433a9 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
@@ -652,14 +652,7 @@ public class AMQMessageDelegate_0_10 implements AMQMessageDelegate
             }
             else if(o == null)
             {
-                if(propertyMap.containsKey(propertyName))
-                {
-                    return null;
-                }
-                else
-                {
-                    return String.valueOf(null);
-                }
+                return null;
             }
             else if(o.getClass().isArray())
             {
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
index d9390c33df..48bd722aae 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
@@ -35,6 +35,7 @@ import org.apache.qpid.url.AMQBindingURL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.jms.Connection;
 import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -90,6 +91,16 @@ public class PropertyValueTest extends QpidTestCase implements MessageListener
         connection.start();
     }
 
+    public void testGetNonexistent() throws Exception
+    {
+        Connection conn = getConnection();
+        Session ssn = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        Message m = ssn.createTextMessage();
+        String s = m.getStringProperty("nonexistent");
+        assertNull(s);
+        conn.close();
+    }
+
     public void testOnce()
     {
         runBatch(1);