From bbc4e1e9c08e77b6513389b962d6be994f9decc8 Mon Sep 17 00:00:00 2001 From: Sorie <819294006@qq.com> Date: Wed, 9 Mar 2022 22:54:42 +0800 Subject: [PATCH] GH-3744: Fix ServerWebSocketContainer.stop() Fixes https://github.com/spring-projects/spring-integration/issues/3744 The `ServerWebSocketContainer.stop()` accidentally calls `this.handshakeHandler.start()` **Cherry-pick to `5.5.x`** --- .../integration/websocket/ServerWebSocketContainer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/ServerWebSocketContainer.java b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/ServerWebSocketContainer.java index e0f600e3ff..815c048e67 100644 --- a/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/ServerWebSocketContainer.java +++ b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/ServerWebSocketContainer.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -232,7 +232,7 @@ public class ServerWebSocketContainer extends IntegrationWebSocketContainer @Override public void stop() { if (isRunning()) { - ((Lifecycle) this.handshakeHandler).start(); + ((Lifecycle) this.handshakeHandler).stop(); } }