summaryrefslogtreecommitdiff
path: root/qpid/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
commit216f71a0e3dce3bb238e3b33b6998c2d0b810d6c (patch)
tree6d98cbe09ab0f39f56c225eb974aa73a403f8189 /qpid/java/client
parentb3e71af2418565438e48b02c7bf69ecc9c85bc48 (diff)
downloadqpid-python-216f71a0e3dce3bb238e3b33b6998c2d0b810d6c.tar.gz
QPID-1233: made getStringProperty(nonexistent) return null instead of NPE
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@685207 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java9
1 files changed, 1 insertions, 8 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
index bfb7b6a9ce..e66ba433a9 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
+++ b/qpid/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())
{