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 | cae29125a3eafa5c3caf809dd58339a4145a57dc (patch) | |
| tree | 667ce00cb69ffd7e45961f2c03e06e6be593ef0a /java | |
| parent | 353803c081fcbe59564bea650891195993f1724e (diff) | |
| download | qpid-python-cae29125a3eafa5c3caf809dd58339a4145a57dc.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/qpid@1549672 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | 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/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java b/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java index a52510d132..dcf531c6b5 100644 --- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java +++ b/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; |