summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2010-10-11 17:38:48 +0000
committerRobert Gemmell <robbie@apache.org>2010-10-11 17:38:48 +0000
commit44f7d864ee9fb58a8186740d0045a744c0d5b922 (patch)
treebab524d07335517a1c22efb0d070b0b3c394725f
parent4033e1618043b8630b6873d34ad739528cbbc346 (diff)
downloadqpid-python-44f7d864ee9fb58a8186740d0045a744c0d5b922.tar.gz
QPID-2898: when UUID is null, return null instead of doing String.valueOf()
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1021441 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java
index 0296735699..31cf223428 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java
+++ b/qpid/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()