From 077619a135faf171ba85baf1c8acb250c93f2657 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Mon, 9 Dec 2013 20:37:57 +0000 Subject: QPID-5386 : [JMS AMQP 1.0] message not coverted correctly if it contains a delivery-annotation section (patch from Xin Chen) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1549672 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'qpid/java') diff --git a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java index a52510d132..dcf531c6b5 100644 --- a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java +++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java @@ -63,6 +63,11 @@ class MessageFactory section = iter.hasNext() ? iter.next() : null; } + if(section instanceof DeliveryAnnotations) + { + section = iter.hasNext() ? iter.next() : null; + } + if(section instanceof MessageAnnotations) { messageAnnotations = (MessageAnnotations) section; -- cgit v1.2.1