Make sure ReceivedDelay is non-negative

seanliu-oss · artembilan · commit 6ffaeb5af30c · 2024-04-01T14:48:30.000-04:00
Related to #2667 The `DefaultMessagePropertiesConverter.toMessageProperties()` may receive an `x-delay` header as negative value. # Conflicts: # spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/DefaultMessagePropertiesConverter.java
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/DefaultMessagePropertiesConverter.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/DefaultMessagePropertiesConverter.java
@@ -95,9 +95,9 @@ public MessageProperties toMessageProperties(final BasicProperties source, final
 				if (MessageProperties.X_DELAY.equals(key)) {
 					Object value = entry.getValue();
 					if (value instanceof Number numberValue) {
-						int receivedDelayLongValue = numberValue.intValue();
-						target.setReceivedDelay(receivedDelayLongValue);
-						target.setHeader(key, receivedDelayLongValue);
+						int receivedDelay = Math.abs(numberValue.intValue());
+						target.setReceivedDelay(receivedDelay);
+						target.setHeader(key, receivedDelay);
 					}
 				}
 				else {

Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,9 @@ public MessageProperties toMessageProperties(final BasicProperties source, final`
`95`	`95`	`if (MessageProperties.X_DELAY.equals(key)) {`
`96`	`96`	`Object value = entry.getValue();`
`97`	`97`	`if (value instanceof Number numberValue) {`
`98`		`- int receivedDelayLongValue = numberValue.intValue();`
`99`		`- target.setReceivedDelay(receivedDelayLongValue);`
`100`		`- target.setHeader(key, receivedDelayLongValue);`
	`98`	`+ int receivedDelay = Math.abs(numberValue.intValue());`
	`99`	`+ target.setReceivedDelay(receivedDelay);`
	`100`	`+ target.setHeader(key, receivedDelay);`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`	`else {`