Spring/spring-amqp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix NPE in AbstractJackson2MessageConverter for missed contentType

Browse Source
This commit is contained in:
Artem Bilan
2025-05-15 16:27:38 -04:00
parent 28322d9392
commit 365b2c4c45
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractJackson2MessageConverter.java
View File

@@ -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);