From bd5843de810e848e73f84f83805415dbf94b6914 Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Mon, 20 Feb 2012 21:21:43 +0000
Subject: 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
---
 .../java/org/apache/qpid/server/subscription/Subscription_0_10.java   | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'qpid/java')

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());
+                }
 
 
             }
-- 
cgit v1.2.1