Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Remove now unnecessary workaround for older proton-j TTL issue.
This commit is contained in:
Timothy Bish 2014-10-20 09:42:56 -04:00
parent 004568234b
commit 5a6129b512
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
View File

@ -645,19 +645,10 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter {
message.setTransactionId(new LocalTransactionId(connectionId, txid)); 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(); message.onSend();
if (!delivery.remotelySettled()) { if (!delivery.remotelySettled()) {
sendToActiveMQ(message, new ResponseHandler() { sendToActiveMQ(message, new ResponseHandler() {
@Override @Override
public void onResponse(IAmqpProtocolConverter converter, Response response) throws IOException { public void onResponse(IAmqpProtocolConverter converter, Response response) throws IOException {
if (response.isException()) { if (response.isException()) {