small refactor for clarity, add note about exception handling
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/1af530ad Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/1af530ad Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/1af530ad Branch: refs/heads/master Commit: 1af530adab2fc8e8d2ca5364aac880ab4bed4ef4 Parents: 148e1b9 Author: Robert Gemmell <[email protected]> Authored: Thu Sep 25 11:14:00 2014 +0100 Committer: Robert Gemmell <[email protected]> Committed: Thu Sep 25 15:23:42 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/qpid/jms/JmsMessageConsumer.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1af530ad/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 07cba2a..129b1e7 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 @@ -249,9 +249,9 @@ public class JmsMessageConsumer implements MessageConsumer, JmsMessageAvailableC if (message.getAcknowledgeCallback() != null || session.isTransacted()) { // Message has been received by the app.. expand the credit // window so that we receive more messages. - session.acknowledge(envelope, ACK_TYPE.DELIVERED); + doAckDelivered(envelope); } else { - doAck(envelope); + doAckConsumed(envelope); } // Tags that we have delivered and can't close if in a TX Session. delivered.set(true); @@ -259,7 +259,7 @@ public class JmsMessageConsumer implements MessageConsumer, JmsMessageAvailableC return envelope; } - private void doAck(final JmsInboundMessageDispatch envelope) throws JMSException { + private void doAckConsumed(final JmsInboundMessageDispatch envelope) throws JMSException { checkClosed(); try { session.acknowledge(envelope, ACK_TYPE.CONSUMED); @@ -269,6 +269,11 @@ 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); + } + /** * Called from the session when a new Message has been dispatched to this Consumer * from the connection. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
