fix synthetic ttl check issue exposed by tests after prior commit
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/72639ba7 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/72639ba7 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/72639ba7 Branch: refs/heads/master Commit: 72639ba7bbdd77e91e4cef8b7120e210782a5ddd Parents: d10da2c Author: Robert Gemmell <[email protected]> Authored: Wed Oct 1 16:12:00 2014 +0100 Committer: Robert Gemmell <[email protected]> Committed: Wed Oct 1 16:12:59 2014 +0100 ---------------------------------------------------------------------- .../provider/amqp/message/AmqpJmsMessageFacade.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/72639ba7/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java index afc3623..1b7c92d 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java @@ -116,7 +116,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { applicationPropertiesMap = message.getApplicationProperties().getValue(); } - Long ttl = message.getTtl(); + Long ttl = getTtl(); Long absoluteExpiryTime = getAbsoluteExpiryTime(); if (absoluteExpiryTime == null && ttl != null) { syntheticExpiration = System.currentTimeMillis() + ttl; @@ -807,6 +807,18 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { return result; } + private Long getTtl() { + Long result = null; + if (message.getHeader() != null) { + UnsignedInteger ttl = message.getHeader().getTtl(); + if (ttl != null) { + result = ttl.longValue(); + } + } + + return result; + } + private void setAbsoluteExpiryTime(Long expiration) { if (expiration == null) { if (message.getProperties() != null) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
