Repository: qpid-jms Updated Branches: refs/heads/master 2bd7b1cc4 -> 36a012c1a
Add try/catch in ack for delviered case, this should also signal that the provider has an unrecoverable error, a failover provider won't signal error here only a direct connect. Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/36a012c1 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/36a012c1 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/36a012c1 Branch: refs/heads/master Commit: 36a012c1aaf5ae7ff9068fb8497524b58456507c Parents: 2bd7b1c Author: Timothy Bish <[email protected]> Authored: Thu Sep 25 11:28:41 2014 -0400 Committer: Timothy Bish <[email protected]> Committed: Thu Sep 25 11:28:41 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/qpid/jms/JmsMessageConsumer.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/36a012c1/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java index 129b1e7..2d9e0ec 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java @@ -35,8 +35,8 @@ import org.apache.qpid.jms.message.JmsMessage; import org.apache.qpid.jms.meta.JmsConsumerId; import org.apache.qpid.jms.meta.JmsConsumerInfo; import org.apache.qpid.jms.provider.Provider; -import org.apache.qpid.jms.provider.ProviderFuture; import org.apache.qpid.jms.provider.ProviderConstants.ACK_TYPE; +import org.apache.qpid.jms.provider.ProviderFuture; import org.apache.qpid.jms.util.FifoMessageQueue; import org.apache.qpid.jms.util.MessageQueue; import org.apache.qpid.jms.util.PriorityMessageQueue; @@ -270,8 +270,12 @@ public class JmsMessageConsumer implements MessageConsumer, JmsMessageAvailableC } private void doAckDelivered(final JmsInboundMessageDispatch envelope) throws JMSException { - // TODO: this can also throw, so should we handle it the same as doAckConsumed above? - session.acknowledge(envelope, ACK_TYPE.DELIVERED); + try { + session.acknowledge(envelope, ACK_TYPE.DELIVERED); + } catch (JMSException ex) { + session.onException(ex); + throw ex; + } } /** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
