From 344ca0282a94ff5dc364a25186593249bbd478d8 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Thu, 20 Feb 2014 16:00:32 +0000 Subject: QPID-5569 : NPE on getStringProperty("JMSXUserId") git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1570247 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/java/client/src') 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) -- cgit v1.2.1