Author: robbie
Date: Wed Oct 15 15:31:18 2014
New Revision: 1632091
URL: http://svn.apache.org/r1632091
Log:
PROTON-715: subtract 1 when setting delivery-count header based on
JMSXDeliveryCount during outbound Native transformation
Modified:
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AMQPNativeOutboundTransformer.java
Modified:
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AMQPNativeOutboundTransformer.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AMQPNativeOutboundTransformer.java?rev=1632091&r1=1632090&r2=1632091&view=diff
==============================================================================
---
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AMQPNativeOutboundTransformer.java
(original)
+++
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AMQPNativeOutboundTransformer.java
Wed Oct 15 15:31:18 2014
@@ -81,7 +81,9 @@ public class AMQPNativeOutboundTransform
}
// Update the DeliveryCount header...
- amqp.getHeader().setDeliveryCount(new UnsignedInteger(count));
+ // The AMQP delivery-count field only includes prior failed
delivery attempts,
+ // whereas JMSXDeliveryCount includes the first/current
delivery attempt. Subtract 1.
+ amqp.getHeader().setDeliveryCount(new UnsignedInteger(count -
1));
// Re-encode...
ByteBuffer buffer = ByteBuffer.wrap(new byte[1024*4]);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
