summaryrefslogtreecommitdiff
path: root/qpid/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
commit12245e93a7485a79e2b2e9b91c6c4ef5e2b565c7 (patch)
treeccec66fd8cfef866f2a6c74e858328b568409b43 /qpid/java
parente77fa983d2b127b1d0c1d6aaf73dc605b5c05a3e (diff)
downloadqpid-python-12245e93a7485a79e2b2e9b91c6c4ef5e2b565c7.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@1203135 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java2
1 files changed, 1 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 31cf223428..2f30f260c9 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
@@ -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();