Vijay receive message ttl fix (#17678)

* Fixing a regresion in message converter. * Changing version number.
Azure · Nov 19, 2020 · 8db7cef · 8db7cef
1 parent 3529a08
commit 8db7cef
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml
@@ -140,7 +140,7 @@
         <dependency>
           <groupId>com.microsoft.azure</groupId>
           <artifactId>azure-servicebus</artifactId>
-          <version>3.5.0</version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus;current} -->
+          <version>3.5.1</version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus;current} -->
         </dependency>
       </dependencies>
       <properties>

diff --git a/eng/versioning/version_data.txt b/eng/versioning/version_data.txt
@@ -34,7 +34,7 @@ com.microsoft.azure:azure-keyvault-cryptography;1.2.4;1.3.0-beta.1
 com.microsoft.azure:azure-keyvault-extensions;1.2.4;1.3.0-beta.1
 com.microsoft.azure:azure-keyvault-test;1.2.3;1.2.4
 com.microsoft.azure:azure-keyvault-webkey;1.2.4;1.3.0-beta.1
-com.microsoft.azure:azure-servicebus;3.4.0;3.5.0
+com.microsoft.azure:azure-servicebus;3.5.0;3.5.1
 com.microsoft.azure:azure-storage-blob;11.0.2;11.0.2
 com.microsoft.azure.msi_auth_token_provider:azure-authentication-msi-token-provider;1.1.0-beta.1;1.1.0-beta.1
 com.microsoft.azure:azure-eventgrid;1.4.0-beta.1;1.4.0-beta.1

diff --git a/sdk/servicebus/microsoft-azure-servicebus/README.md b/sdk/servicebus/microsoft-azure-servicebus/README.md
@@ -19,7 +19,7 @@ The package can be downloaded from [Maven](https://search.maven.org/artifact/com
 <dependency>
   <groupId>com.microsoft.azure</groupId>
   <artifactId>azure-servicebus</artifactId>
-  <version>3.5.0</version>
+  <version>3.5.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

diff --git a/sdk/servicebus/microsoft-azure-servicebus/pom.xml b/sdk/servicebus/microsoft-azure-servicebus/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.microsoft.azure</groupId>
   <artifactId>azure-servicebus</artifactId>
-  <version>3.5.0</version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus;current} -->
+  <version>3.5.1</version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus;current} -->
 
   <name>Microsoft Azure SDK for Service Bus</name>
   <description>Java library for Azure Service Bus</description>

diff --git a/...osoft-azure-servicebus/src/main/java/com/microsoft/azure/servicebus/MessageConverter.java b/...osoft-azure-servicebus/src/main/java/com/microsoft/azure/servicebus/MessageConverter.java
@@ -131,14 +131,20 @@ public static Message convertAmqpMessageToBrokeredMessage(org.apache.qpid.proton
         // Header
         // Delivery count for service bus starts from 1, for AMQP it starts from 0.
         brokeredMessage.setDeliveryCount(amqpMessage.getDeliveryCount() + 1);
-        brokeredMessage.setTimeToLive(Duration.ofMillis(amqpMessage.getTtl()));
-
+        long ttlMillis = amqpMessage.getTtl();
+        if (ttlMillis > 0l) {
+        	brokeredMessage.setTimeToLive(Duration.ofMillis(ttlMillis));
+        }
 
         // Properties
         // Override TimeToLive from CrationTime and ExpiryTime, as they support duration of any length, which ttl doesn't
         if (amqpMessage.getCreationTime() != 0l && amqpMessage.getExpiryTime() != 0l) {
-        	brokeredMessage.setTimeToLive(Duration.ofMillis(amqpMessage.getExpiryTime() - amqpMessage.getCreationTime()));
+        	ttlMillis = amqpMessage.getExpiryTime() - amqpMessage.getCreationTime();
+        	if (ttlMillis > 0l)	{
+        		brokeredMessage.setTimeToLive(Duration.ofMillis(ttlMillis));
+        	}
         }
+
         Object messageId = amqpMessage.getMessageId();
         if (messageId != null) {
             brokeredMessage.setMessageId(messageId.toString());

diff --git a/...-servicebus/src/main/java/com/microsoft/azure/servicebus/management/QueueDescription.java b/...-servicebus/src/main/java/com/microsoft/azure/servicebus/management/QueueDescription.java
@@ -399,7 +399,7 @@ public void setUserMetadata(String userMetadata) {
         this.userMetadata = userMetadata;
     }
 
-    boolean getSupportOrdering() {
+    boolean isSupportOrdering() {
     	if (this.isSupportOrderingExplicitlySet) {
     		return this.supportOrdering;
     	} else {
@@ -442,7 +442,7 @@ public boolean equals(Object o) {
                 && AuthorizationRuleSerializer.equals(this.authorizationRules, other.authorizationRules)
         		&& this.enableExpress == other.enableExpress 
         		&& this.isAnonymousAccessible == other.isAnonymousAccessible
-        		&& this.supportOrdering == other.supportOrdering ) {
+        		&& this.isSupportOrdering() == other.isSupportOrdering() ) {
             return true;
         }