activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [35/36] activemq-artemis git commit: fixing AMQP
Date Fri, 03 Mar 2017 01:05:28 GMT
fixing AMQP


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/42461287
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/42461287
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/42461287

Branch: refs/heads/artemis-1009
Commit: 4246128724ebbb6f6dd3bcfe5867abaf512f20bb
Parents: dee754f
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Wed Mar 1 16:19:51 2017 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Thu Mar 2 20:04:30 2017 -0500

----------------------------------------------------------------------
 .../activemq/artemis/protocol/amqp/broker/AMQPMessage.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/42461287/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
index 7fabefd..d39bf9d 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
@@ -203,6 +203,10 @@ public class AMQPMessage extends RefCountMessage {
             headerEnd = buffer.position();
             _header = (Header) section;
 
+            if (_header.getTtl() != null) {
+               this.expiration = System.currentTimeMillis() + _header.getTtl().intValue();
+            }
+
             if (!readApplicationProperties) {
                return;
             }
@@ -243,10 +247,6 @@ public class AMQPMessage extends RefCountMessage {
          if (section instanceof Properties) {
             _properties = (Properties) section;
 
-            if (_header.getTtl() != null) {
-               this.expiration = System.currentTimeMillis() + _header.getTtl().intValue();
-            }
-
             if (buffer.hasRemaining()) {
                section = (Section) decoder.readObject();
             } else {


Mime
View raw message