Skip to content

Commit 007bded

Browse files
committed
Add missing check to avoid re-initialization
Noticed during review of #28736 that a check protecting against re-initialization was accidentally removed in commit 3d6e38b.
1 parent 22cc6c5 commit 007bded

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationSupport.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,14 @@ protected void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
8484
@Bean
8585
@Nullable
8686
public TaskScheduler defaultSockJsTaskScheduler() {
87-
if (initHandlerRegistry().requiresTaskScheduler()) {
88-
ThreadPoolTaskScheduler threadPoolScheduler = new ThreadPoolTaskScheduler();
89-
threadPoolScheduler.setThreadNamePrefix("SockJS-");
90-
threadPoolScheduler.setPoolSize(Runtime.getRuntime().availableProcessors());
91-
threadPoolScheduler.setRemoveOnCancelPolicy(true);
92-
this.scheduler = threadPoolScheduler;
87+
if (this.scheduler == null) {
88+
if (initHandlerRegistry().requiresTaskScheduler()) {
89+
ThreadPoolTaskScheduler threadPoolScheduler = new ThreadPoolTaskScheduler();
90+
threadPoolScheduler.setThreadNamePrefix("SockJS-");
91+
threadPoolScheduler.setPoolSize(Runtime.getRuntime().availableProcessors());
92+
threadPoolScheduler.setRemoveOnCancelPolicy(true);
93+
this.scheduler = threadPoolScheduler;
94+
}
9395
}
9496
return this.scheduler;
9597
}

0 commit comments

Comments
 (0)