1 files changed, 2 insertions, 4 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
index b8c5fc8faf..22824d9f1c 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
@@ -98,13 +98,11 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer
             deliveryProp.setTimestamp(currentTime);
             if (timeToLive > 0)
             {
-                deliveryProp.setExpiration(currentTime + timeToLive);
-                message.setJMSExpiration(currentTime + timeToLive);
+                deliveryProp.setTtl(timeToLive);                
             }
             else
             {
-               deliveryProp.setExpiration(0);
-               message.setJMSExpiration(0);
+               deliveryProp.setTtl(0);
             }
             message.setJMSTimestamp(currentTime);
         }