summaryrefslogtreecommitdiff
path: root/java/client
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2008-08-12 15:58:58 +0000
committerRafael H. Schloming <rhs@apache.org>2008-08-12 15:58:58 +0000
commitdd54154fbffaa98477579b0784ec9e33da8f92f2 (patch)
tree5d6d7cad293fedff415288467b0adb3f62ee9bec /java/client
parentd7327d3630299b7802a857c70410e4f846b8a046 (diff)
downloadqpid-python-dd54154fbffaa98477579b0784ec9e33da8f92f2.tar.gz
QPID-1233: made getStringProperty(nonexistent) return null instead of NPE
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@685207 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/client')
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java9
1 files changed, 1 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())
{