diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2013-12-10 14:45:54 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2013-12-10 14:45:54 +0000 |
| commit | 8512729ec19d2f1e26bcefcf7da0c470a08242fd (patch) | |
| tree | 71bf2baae4ed3de4840d2198b48abc24caef6362 | |
| parent | 86915ff094ab2fea35b642e75e0a5cf5804328f1 (diff) | |
| download | qpid-python-8512729ec19d2f1e26bcefcf7da0c470a08242fd.tar.gz | |
Merged r1549672 to 0.26 branch
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.26@1549853 13f79535-47bb-0310-9956-ffa450edef68
| -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; |