qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgodf...@apache.org
Subject svn commit: r1549672 - /qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java
Date Mon, 09 Dec 2013 20:37:57 GMT
Author: rgodfrey
Date: Mon Dec  9 20:37:57 2013
New Revision: 1549672

URL: http://svn.apache.org/r1549672
Log:
QPID-5386 : [JMS AMQP 1.0] message not coverted correctly if it contains a delivery-annotation
section (patch from Xin Chen)

Modified:
    qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java

Modified: qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java?rev=1549672&r1=1549671&r2=1549672&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java
(original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageFactory.java
Mon Dec  9 20:37:57 2013
@@ -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;



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message