summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2011-11-17 10:13:44 +0000
committerKeith Wall <kwall@apache.org>2011-11-17 10:13:44 +0000
commit722f1ebe2fd51b927e98fd08d521af62ec75f3a8 (patch)
tree60df470d6b182f94361a696f587c41f8cf335d61 /java
parent1c64fde0e41588ffad98ebd98146fdb3f7c28da0 (diff)
downloadqpid-python-722f1ebe2fd51b927e98fd08d521af62ec75f3a8.tar.gz
QPID-3617: AMQQueueMBean.viewMessages: Viewing message without priority set ends with NullPointerException
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1203135 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java2
1 files changed, 1 insertions, 1 deletions
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 31cf223428..2f30f260c9 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
@@ -79,7 +79,7 @@ class MessageTransferHeader implements AMQMessageHeader
public byte getPriority()
{
- MessageDeliveryPriority priority = _deliveryProps == null
+ MessageDeliveryPriority priority = _deliveryProps == null || !_deliveryProps.hasPriority()
? MessageDeliveryPriority.MEDIUM
: _deliveryProps.getPriority();
return (byte) priority.getValue();