fix ack callback detection order

SolaceProducts · Aug 28, 2024 · 7243476 · 7243476
1 parent 7579552
commit 7243476
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...e/src/main/java/com/solace/spring/cloud/stream/binder/util/SolaceErrorMessageHandler.java b/...e/src/main/java/com/solace/spring/cloud/stream/binder/util/SolaceErrorMessageHandler.java
@@ -34,6 +34,10 @@ public void handleMessage(Message<?> message) throws MessagingException {
 		Throwable payload = errorMessage.getPayload();
 
 		Set<AcknowledgmentCallback> acknowledgmentCallbacks = new HashSet<>();
+
+		Optional.ofNullable(StaticMessageHeaderAccessor.getAcknowledgmentCallback(message))
+				.ifPresent(acknowledgmentCallbacks::add);
+
 		if (payload instanceof MessagingException messagingException) {
 			Optional.ofNullable(messagingException.getFailedMessage())
 					.map(m -> {
@@ -52,9 +56,6 @@ public void handleMessage(Message<?> message) throws MessagingException {
 				.map(StaticMessageHeaderAccessor::getAcknowledgmentCallback)
 				.ifPresent(acknowledgmentCallbacks::add);
 
-		Optional.ofNullable(StaticMessageHeaderAccessor.getAcknowledgmentCallback(message))
-				.ifPresent(acknowledgmentCallbacks::add);
-
 		if (StaticMessageHeaderAccessor.getSourceData(message) instanceof XMLMessage xmlMessage) {
 			info.append("source-jcsmp-message: ").append(xmlMessage.getMessageId()).append(", ");
 		}