From 365b2c4c45bbfab594dca266fd4f31d4f70670a6 Mon Sep 17 00:00:00 2001
From: Artem Bilan <artem.bilan@broadcom.com>
Date: Thu, 15 May 2025 16:27:38 -0400
Subject: [PATCH] Fix NPE in AbstractJackson2MessageConverter for missed
 contentType

---
 .../support/converter/AbstractJackson2MessageConverter.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractJackson2MessageConverter.java b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractJackson2MessageConverter.java
index f860ba8e..a81cc07e 100644
--- a/spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractJackson2MessageConverter.java
+++ b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractJackson2MessageConverter.java
@@ -312,8 +312,10 @@ public abstract class AbstractJackson2MessageConverter extends AbstractMessageCo
 		Object content = null;
 		MessageProperties properties = message.getMessageProperties();
 		String contentType = properties.getContentType();
-		if (this.assumeSupportedContentType && contentType.equals(MessageProperties.DEFAULT_CONTENT_TYPE)
-				|| contentType.contains(this.supportedContentType.getSubtype())) {
+		if (this.assumeSupportedContentType &&
+				(contentType == null ||
+						contentType.equals(MessageProperties.DEFAULT_CONTENT_TYPE) ||
+						contentType.contains(this.supportedContentType.getSubtype()))) {
 
 			String encoding = determineEncoding(properties, contentType);
 			content = doFromMessage(message, conversionHint, properties, encoding);