From 932ebedd275f667e013aa5c1a3cafeee15d2afae Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Thu, 17 Nov 2011 18:33:15 +0000 Subject: 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 --- .../main/java/org/apache/qpid/server/message/MessageTransferHeader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); -- cgit v1.2.1