summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2012-02-20 21:21:43 +0000
committerRobert Godfrey <rgodfrey@apache.org>2012-02-20 21:21:43 +0000
commitbd5843de810e848e73f84f83805415dbf94b6914 (patch)
treed399ad74f8ac9b4a7e91b782efb8044b8f7c06d3 /qpid/java
parent7286cc6ca7752bf0b3244b7cc83a76e93b924ec4 (diff)
downloadqpid-python-bd5843de810e848e73f84f83805415dbf94b6914.tar.gz
QPID-3588 : Python message echo test fails against Java broker because only expiration is passed to client, not TTL.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1291449 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
index 9a7d69b10d..3a0a0e76ad 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
@@ -409,6 +409,10 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr
{
deliveryProps.setTimestamp(origDeliveryProps.getTimestamp());
}
+ if(origDeliveryProps.hasTtl())
+ {
+ deliveryProps.setTtl(origDeliveryProps.getTtl());
+ }
}