Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix race condition in WriteResultPublisher between subscription and completion in publishComplete #24989

Closed
wants to merge 1 commit into from
Closed

Fix race condition in WriteResultPublisher between subscription and completion in publishComplete #24989

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions spring-web/src/main/java/org/springframework/http/server/reactive/WriteResultPublisher.java
View file
Open in desktop
Expand Up @@ -175,6 +175,10 @@ void subscribe(WriteResultPublisher publisher, Subscriber<? super Void> subscrib
@Override
void publishComplete(WriteResultPublisher publisher) {
publisher.completedBeforeSubscribed = true;
// May have already passed the SUBSCRIBED's state's completedBeforeSubscribed check..
if(State.SUBSCRIBED.equals(publisher.state.get())) {
publisher.state.get().publishComplete(publisher);
}
}
@Override
void publishError(WriteResultPublisher publisher, Throwable ex) {
Expand All @@ -190,6 +194,10 @@ void request(WriteResultPublisher publisher, long n) {
@Override
void publishComplete(WriteResultPublisher publisher) {
publisher.completedBeforeSubscribed = true;
// May have already passed the SUBSCRIBED's state's completedBeforeSubscribed check..
if(State.SUBSCRIBED.equals(publisher.state.get())) {
publisher.state.get().publishComplete(publisher);
}
}
@Override
void publishError(WriteResultPublisher publisher, Throwable ex) {
Expand Down