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

Fix NPE in RSocketInboundGateway.decodePayload()

Browse Source
This commit is contained in:
Artem Bilan
2019-11-14 10:02:56 -05:00
parent 72f7c72392
commit 069d8730e0
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/inbound/RSocketInboundGateway.java
View File

@@ -185,14 +185,21 @@ public class RSocketInboundGateway extends MessagingGatewaySupport implements In
}
private Mono<Message<?>> decodeRequestMessage(Message<?> requestMessage) {
return Mono.just(decodePayload(requestMessage))
.map((payload) ->
MessageBuilder.withPayload(payload)
.copyHeaders(requestMessage.getHeaders())
.build());
Object data = decodePayload(requestMessage);
if (data == null) {
return Mono.just(requestMessage);
}
else {
return Mono.just(data)
.map((payload) ->
MessageBuilder.withPayload(payload)
.copyHeaders(requestMessage.getHeaders())
.build());
}
}
@SuppressWarnings("unchecked")
@Nullable
private Object decodePayload(Message<?> requestMessage) {
ResolvableType elementType = this.requestElementType;
MimeType mimeType = requestMessage.getHeaders().get(MessageHeaders.CONTENT_TYPE, MimeType.class);