Skip to content

Conversation

@artembilan
Copy link
Member

Fixes: #10487

  • Fix WebSocketInboundChannelAdapter to register own client session in the StompSubProtocolHandler for a proper correlation for upcoming messages from the server
  • Fix WebSocketOutboundMessageHandlerTests to produce required STOMP CONNECT before publishing data

Cherry-pick to 6.5.x & 6.4.x

Fixes: spring-projects#10487

* Fix `WebSocketInboundChannelAdapter` to register own client session
in the `StompSubProtocolHandler` for a proper correlation for upcoming messages from the server
* Fix `WebSocketOutboundMessageHandlerTests` to produce required STOMP `CONNECT` before publishing data

Cherry-pick to `6.5.x` & `6.4.x`
@artembilan artembilan requested a review from cppwfs October 16, 2025 13:29
@artembilan
Copy link
Member Author

NOTE: the cherry-pick might require some manual conflict fixes since there is no JSpecify in 6.5.x & 6.4.x branches.

Copy link
Contributor

@cppwfs cppwfs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for getting this turned around so quickly!

Looks good, just my usual annoying nitpicks.

@artembilan
Copy link
Member Author

@cppwfs ,

please, give this a priority.
It has to make it into upcoming release next Tuesday.
Thanks

@artembilan artembilan requested a review from cppwfs October 16, 2025 17:56
Copy link
Contributor

@cppwfs cppwfs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cppwfs cppwfs merged commit 7fee863 into spring-projects:main Oct 16, 2025
3 checks passed
artembilan added a commit that referenced this pull request Oct 16, 2025
Fixes: #10487

* Fix `WebSocketInboundChannelAdapter` to register own client session
in the `StompSubProtocolHandler` for a proper correlation for upcoming messages from the server
* Fix `WebSocketOutboundMessageHandlerTests` to produce required STOMP `CONNECT` before publishing data

**Auto-cherry-pick to `6.4.x`**
# Conflicts:
#	spring-integration-websocket/src/main/java/org/springframework/integration/websocket/inbound/WebSocketInboundChannelAdapter.java
spring-builds pushed a commit that referenced this pull request Oct 16, 2025
Fixes: #10487

* Fix `WebSocketInboundChannelAdapter` to register own client session
in the `StompSubProtocolHandler` for a proper correlation for upcoming messages from the server
* Fix `WebSocketOutboundMessageHandlerTests` to produce required STOMP `CONNECT` before publishing data

# Conflicts:
#	spring-integration-websocket/src/main/java/org/springframework/integration/websocket/inbound/WebSocketInboundChannelAdapter.java

(cherry picked from commit 30d4159)
@artembilan artembilan deleted the GH-10487 branch October 16, 2025 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Fix WebSocket module for required STOMP CONNECT frame

2 participants