diff options
author | Robert Gemmell <robbie@apache.org> | 2011-11-17 18:33:15 +0000 |
---|---|---|
committer | Robert Gemmell <robbie@apache.org> | 2011-11-17 18:33:15 +0000 |
commit | 932ebedd275f667e013aa5c1a3cafeee15d2afae (patch) | |
tree | 5c138be90f4dac9f8b4cc86cc5dcca9fe7babac8 | |
parent | 068570f099af4e672dff99e96de91e846f1f942f (diff) | |
download | qpid-python-932ebedd275f667e013aa5c1a3cafeee15d2afae.tar.gz |
QPID-3617: AMQQueueMBean.viewMessages: Viewing message without priority set ends with NullPointerException
merged from trunk r1203135
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.14@1203314 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java | 2 |
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(); |