Skip to content

Commit 60a7092

Browse files
committed
Fix dataMimeType and metadataMimeType mixup in precondition check
Closes gh-23292
1 parent c788be3 commit 60a7092

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ protected List<? extends HandlerMethodReturnValueHandler> initReturnValueHandler
223223
}
224224

225225

226+
@Override
226227
@Nullable
227228
protected CompositeMessageCondition getCondition(AnnotatedElement element) {
228229
MessageMapping annot1 = AnnotatedElementUtils.findMergedAnnotation(element, MessageMapping.class);
@@ -305,16 +306,16 @@ private MessagingRSocket createResponder(ConnectionSetupPayload setupPayload, RS
305306
Assert.notNull(dataMimeType, "No `dataMimeType` in ConnectionSetupPayload and no default value");
306307

307308
s = setupPayload.metadataMimeType();
308-
MimeType metaMimeType = StringUtils.hasText(s) ? MimeTypeUtils.parseMimeType(s) : this.defaultMetadataMimeType;
309-
Assert.notNull(dataMimeType, "No `metadataMimeType` in ConnectionSetupPayload and no default value");
309+
MimeType metadataMimeType = StringUtils.hasText(s) ? MimeTypeUtils.parseMimeType(s) : this.defaultMetadataMimeType;
310+
Assert.notNull(metadataMimeType, "No `metadataMimeType` in ConnectionSetupPayload and no default value");
310311

311312
RSocketStrategies strategies = this.rsocketStrategies;
312313
Assert.notNull(strategies, "No RSocketStrategies. Was afterPropertiesSet not called?");
313-
RSocketRequester requester = RSocketRequester.wrap(rsocket, dataMimeType, metaMimeType, strategies);
314+
RSocketRequester requester = RSocketRequester.wrap(rsocket, dataMimeType, metadataMimeType, strategies);
314315

315316
Assert.notNull(this.metadataExtractor, () -> "No MetadataExtractor. Was afterPropertiesSet not called?");
316317

317-
return new MessagingRSocket(dataMimeType, metaMimeType, this.metadataExtractor, requester,
318+
return new MessagingRSocket(dataMimeType, metadataMimeType, this.metadataExtractor, requester,
318319
this, getRouteMatcher(), strategies.dataBufferFactory());
319320
}
320321

0 commit comments

Comments
 (0)