diff options
Diffstat (limited to 'qpid/java/client/src/main')
| -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) |