Repository: qpid-jms Updated Branches: refs/heads/master 10af4ad80 -> 52f5d9f76
QPIDJMS-166 Remove some dead code and update a TODO Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/52f5d9f7 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/52f5d9f7 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/52f5d9f7 Branch: refs/heads/master Commit: 52f5d9f765cd75699704ee7795c531fcaa30376a Parents: 10af4ad Author: Timothy Bish <[email protected]> Authored: Wed Apr 6 14:06:59 2016 -0400 Committer: Timothy Bish <[email protected]> Committed: Wed Apr 6 14:06:59 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/qpid/jms/JmsMessageConsumer.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/52f5d9f7/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 9a448a1..826438c 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 @@ -264,11 +264,6 @@ public class JmsMessageConsumer implements AutoCloseable, MessageConsumer, JmsMe // closed until future pulls were performed. } } - - } else if (envelope.getMessage() == null) { - //TODO: do we still need this now? - LOG.trace("{} no message was available for this consumer: {}", getConsumerId()); - return null; } else if (consumeExpiredMessage(envelope)) { LOG.trace("{} filtered expired message: {}", getConsumerId(), envelope); doAckExpired(envelope); @@ -695,10 +690,10 @@ public class JmsMessageConsumer implements AutoCloseable, MessageConsumer, JmsMe } } } catch (Exception e) { - // TODO - We need to handle exception of on message with some other - // ack such as rejected and consider adding a redlivery policy - // to control when we might just poison the message with an ack - // of modified set to not deliverable here. + // TODO - There are two cases where we can get an error here, one being + // and error returned from the attempted ACK that was sent and the + // other being an error while attempting to copy the incoming message. + // We need to decide how to respond to these. session.getConnection().onException(e); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
