Remove an unneeded public accessor and just make the calls directly in the AmqpConsumer
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/343a075f Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/343a075f Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/343a075f Branch: refs/heads/master Commit: 343a075f76cbafbb917c374d4ec152f20fe2f203 Parents: 4634188 Author: Timothy Bish <tabish...@gmail.com> Authored: Thu Oct 9 17:24:11 2014 -0400 Committer: Timothy Bish <tabish...@gmail.com> Committed: Thu Oct 9 17:24:11 2014 -0400 ---------------------------------------------------------------------- .../org/apache/qpid/jms/message/JmsInboundMessageDispatch.java | 4 ---- .../src/main/java/org/apache/qpid/jms/message/JmsMessage.java | 4 ---- .../java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java | 3 ++- 3 files changed, 2 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/343a075f/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsInboundMessageDispatch.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsInboundMessageDispatch.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsInboundMessageDispatch.java index c8129ca..bafa945 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsInboundMessageDispatch.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsInboundMessageDispatch.java @@ -49,10 +49,6 @@ public class JmsInboundMessageDispatch extends JmsAbstractResourceId { this.consumerId = consumerId; } - public void onMessageRedelivered() { - this.message.incrementRedeliveryCount(); - } - public void setMessageId(Object object) { this.messageId = object; } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/343a075f/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java index e9838ca..9c1cc0e 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java @@ -505,10 +505,6 @@ public class JmsMessage implements javax.jms.Message { return expireTime > 0 && System.currentTimeMillis() > expireTime; } - public void incrementRedeliveryCount() { - facade.setDeliveryCount(facade.getDeliveryCount() + 1); - } - public JmsMessageFacade getFacade() { return this.facade; } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/343a075f/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java index 515449e..0af029b 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java @@ -267,7 +267,8 @@ public class AmqpConsumer extends AbstractAmqpResource<JmsConsumerInfo, Receiver // TODO - increment redelivery counter and apply connection redelivery policy // to those messages that are past max redlivery. JmsInboundMessageDispatch envelope = (JmsInboundMessageDispatch) delivery.getContext(); - envelope.onMessageRedelivered(); + envelope.getMessage().getFacade().setRedeliveryCount( + envelope.getMessage().getFacade().getRedeliveryCount() + 1); deliver(envelope); } delivered.clear(); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
