[ServiceBus] Reading TTL as the difference between absoluteexpirytime…

… and creationtime (#12225) TTL field in the message header is of type unsigned integer, so it cannot support TTL values larger than 50 days when converted to milliseconds. So reading TTL as the difference between AbsoluteExpiryTime and CreationTime properties on the AMQP message.
Azure · May 26, 2020 · e2f8099 · e2f8099
1 parent 27053f8
commit e2f8099
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/sdk/servicebus/Microsoft.Azure.ServiceBus/src/Amqp/AmqpMessageConverter.cs b/sdk/servicebus/Microsoft.Azure.ServiceBus/src/Amqp/AmqpMessageConverter.cs
@@ -113,7 +113,7 @@ public static AmqpMessage SBMessageToAmqpMessage(SBMessage sbMessage)
 
             if (sbMessage.TimeToLive != TimeSpan.MaxValue)
             {
-                amqpMessage.Header.Ttl = (uint)sbMessage.TimeToLive.TotalMilliseconds;
+                amqpMessage.Header.Ttl = sbMessage.TimeToLive.TotalMilliseconds < UInt32.MaxValue ? (uint)sbMessage.TimeToLive.TotalMilliseconds : UInt32.MaxValue;
                 amqpMessage.Properties.CreationTime = DateTime.UtcNow;
 
                 if (AmqpConstants.MaxAbsoluteExpiryTime - amqpMessage.Properties.CreationTime.Value > sbMessage.TimeToLive)
@@ -274,6 +274,12 @@ public static SBMessage AmqpMessageToSBMessage(AmqpMessage amqpMessage, bool isP
                 {
                     sbMessage.ReplyToSessionId = amqpMessage.Properties.ReplyToGroupId;
                 }
+
+                if (amqpMessage.Properties.CreationTime.HasValue && amqpMessage.Properties.AbsoluteExpiryTime.HasValue)
+                {
+                    // Overwrite TimeToLive from AbsoluteExpiryTime
+                    sbMessage.TimeToLive = amqpMessage.Properties.AbsoluteExpiryTime.Value - amqpMessage.Properties.CreationTime.Value;
+                }
             }
 
             // Do application properties before message annotations, because the application properties