diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-02-20 16:00:32 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-02-20 16:00:32 +0000 |
| commit | 344ca0282a94ff5dc364a25186593249bbd478d8 (patch) | |
| tree | 1252387784c7e23317d40ceb46775d27c93b9223 /qpid/java/client | |
| parent | 1080a1c708c09fc2524de3a7d16b46f275e07d24 (diff) | |
| download | qpid-python-344ca0282a94ff5dc364a25186593249bbd478d8.tar.gz | |
QPID-5569 : NPE on getStringProperty("JMSXUserId")
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1570247 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.java | 3 |
1 files changed, 2 insertions, 1 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 ea0319c9df..ad9a37479e 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 @@ -732,7 +732,8 @@ public class AMQMessageDelegate_0_10 extends AbstractAMQMessageDelegate { if (propertyName.equals(CustomJMSXProperty.JMSXUserID.toString())) { - return new String(_messageProps.getUserId()); + final byte[] userIdBytes = _messageProps.getUserId(); + return userIdBytes == null ? null : new String(userIdBytes); } else if (QpidMessageProperties.AMQP_0_10_APP_ID.equals(propertyName) && _messageProps.getAppId() != null) |