Skip to content

Commit ffbacd6

Browse files
committed
Merge pull request #37861 from izeye
* gh-37861: Polish "Avoid ObjectMappear creation in WebSocketMessagingAutoConfiguration" Avoid ObjectMappear creation in WebSocketMessagingAutoConfiguration Closes gh-37861
2 parents e6b2e19 + 932fe4f commit ffbacd6

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -64,8 +64,7 @@ static class WebSocketMessageConverterConfiguration implements WebSocketMessageB
6464

6565
@Override
6666
public boolean configureMessageConverters(List<MessageConverter> messageConverters) {
67-
MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter();
68-
converter.setObjectMapper(this.objectMapper);
67+
MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter(this.objectMapper);
6968
DefaultContentTypeResolver resolver = new DefaultContentTypeResolver();
7069
resolver.setDefaultMimeType(MimeTypeUtils.APPLICATION_JSON);
7170
converter.setContentTypeResolver(resolver);

0 commit comments

Comments
 (0)