activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject [1/2] git commit: https://issues.apache.org/jira/browse/AMQ-5403
Date Mon, 20 Oct 2014 13:56:01 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk 004568234 -> 4881a848d


https://issues.apache.org/jira/browse/AMQ-5403

Remove now unnecessary workaround for older proton-j TTL issue.  

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

Branch: refs/heads/trunk
Commit: 5a6129b51241449a7310bbd812b24274ec8d7914
Parents: 0045682
Author: Timothy Bish <tabish121@gmail.com>
Authored: Mon Oct 20 09:42:56 2014 -0400
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Mon Oct 20 09:42:56 2014 -0400

----------------------------------------------------------------------
 .../activemq/transport/amqp/AmqpProtocolConverter.java   | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/5a6129b5/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
index fa49665..1f8bb36 100644
--- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
+++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
@@ -645,19 +645,10 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter {
                     message.setTransactionId(new LocalTransactionId(connectionId, txid));
                 }
 
-                // Lets handle the case where the expiration was set, but the timestamp
-                // was not set by the client. Lets assign the timestamp now, and adjust
-                // the expiration.
-                if (message.getExpiration() != 0) {
-                    if (message.getTimestamp() == 0) {
-                        message.setTimestamp(System.currentTimeMillis());
-                        message.setExpiration(message.getTimestamp() + message.getExpiration());
-                    }
-                }
-
                 message.onSend();
                 if (!delivery.remotelySettled()) {
                     sendToActiveMQ(message, new ResponseHandler() {
+
                         @Override
                         public void onResponse(IAmqpProtocolConverter converter, Response
response) throws IOException {
                             if (response.isException()) {


Mime
View raw message