diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2013-12-09 20:37:57 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2013-12-09 20:37:57 +0000 |
| commit | 077619a135faf171ba85baf1c8acb250c93f2657 (patch) | |
| tree | c8d14545e0116cb6a95a741e717f653bf6ef82ff /qpid/java | |
| parent | 8bd51f7ee64440da3e82f76bb1ea3bf61afa6aa4 (diff) | |
| download | qpid-python-077619a135faf171ba85baf1c8acb250c93f2657.tar.gz | |
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
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java | 5 |
1 files changed, 5 insertions, 0 deletions
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; |