From 93d1a5bae66d807920ed4b5e238f487fc017a247 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Mon, 11 Oct 2010 17:38:48 +0000 Subject: QPID-2898: when UUID is null, return null instead of doing String.valueOf() git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1021441 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/server/message/MessageTransferHeader.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'java/broker/src') diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java b/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java index 0296735699..31cf223428 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java +++ b/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java @@ -26,6 +26,7 @@ import org.apache.qpid.transport.MessageDeliveryPriority; import java.util.Set; import java.util.Map; +import java.util.UUID; class MessageTransferHeader implements AMQMessageHeader { @@ -61,7 +62,9 @@ class MessageTransferHeader implements AMQMessageHeader public String getMessageId() { - return _messageProps == null ? null : String.valueOf(_messageProps.getMessageId()); + UUID id = _messageProps == null ? null : _messageProps.getMessageId(); + + return id == null ? null : String.valueOf(id); } public String getMimeType() -- cgit v1.2.1