GH-8600: Fix WebSocket removeRegistration
#8601
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes spring-projects#8600 When we register a dynamic WebSocket endpoint and use a `WebSocketHandlerDecoratorFactory` such an endpoint is not removed on an `IntegrationFlow` destruction. The actual `WebSocketHandler` is decorated, however we still use an initial one for condition. * Refactor `IntegrationWebSocketContainer` to expose a `protected` setter for the `WebSocketHandler` which is called from the `ServerWebSocketContainer` after decoration **Cherry-pick to `6.0.x` & `5.5.x`**
garyrussell
suggested changes
Apr 19, 2023
...t/src/main/java/org/springframework/integration/websocket/IntegrationWebSocketContainer.java
Show resolved
Hide resolved
...t/src/main/java/org/springframework/integration/websocket/IntegrationWebSocketContainer.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Gary Russell <grussell@vmware.com>
garyrussell
approved these changes
Apr 19, 2023
garyrussell
added a commit
that referenced
this pull request
Apr 19, 2023
* GH-8600: Fix WebSocket `removeRegistration` Fixes #8600 When we register a dynamic WebSocket endpoint and use a `WebSocketHandlerDecoratorFactory` such an endpoint is not removed on an `IntegrationFlow` destruction. The actual `WebSocketHandler` is decorated, however we still use an initial one for condition. * Refactor `IntegrationWebSocketContainer` to expose a `protected` setter for the `WebSocketHandler` which is called from the `ServerWebSocketContainer` after decoration **Cherry-pick to `6.0.x` & `5.5.x`** * Fix language in Javadocs Co-authored-by: Gary Russell <grussell@vmware.com> --------- Co-authored-by: Gary Russell <grussell@vmware.com>
garyrussell
added a commit
that referenced
this pull request
Apr 19, 2023
* GH-8600: Fix WebSocket `removeRegistration` Fixes #8600 When we register a dynamic WebSocket endpoint and use a `WebSocketHandlerDecoratorFactory` such an endpoint is not removed on an `IntegrationFlow` destruction. The actual `WebSocketHandler` is decorated, however we still use an initial one for condition. * Refactor `IntegrationWebSocketContainer` to expose a `protected` setter for the `WebSocketHandler` which is called from the `ServerWebSocketContainer` after decoration **Cherry-pick to `6.0.x` & `5.5.x`** * Fix language in Javadocs Co-authored-by: Gary Russell <grussell@vmware.com> --------- Co-authored-by: Gary Russell <grussell@vmware.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #8600
When we register a dynamic WebSocket endpoint and use a
WebSocketHandlerDecoratorFactorysuch an endpoint is not removed on anIntegrationFlowdestruction. The actualWebSocketHandleris decorated, however we still use an initial one for condition.IntegrationWebSocketContainerto expose aprotectedsetter for theWebSocketHandlerwhich is called from theServerWebSocketContainerafter decorationCherry-pick to
6.0.x&5.5.x