Fix race condition in WriteResultPublisher

Backport of c35b3e5 Closes gh-24989
spring-projects · May 4, 2020 · 42f60fe · 42f60fe
1 parent ce76a9b
commit 42f60fe
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/WriteResultPublisher.java b/spring-web/src/main/java/org/springframework/http/server/reactive/WriteResultPublisher.java
@@ -175,6 +175,9 @@ void subscribe(WriteResultPublisher publisher, Subscriber<? super Void> subscrib
 			@Override
 			void publishComplete(WriteResultPublisher publisher) {
 				publisher.completedBeforeSubscribed = true;
+				if(State.SUBSCRIBED.equals(publisher.state.get())) {
+					publisher.state.get().publishComplete(publisher);
+				}
 			}
 			@Override
 			void publishError(WriteResultPublisher publisher, Throwable ex) {
@@ -190,6 +193,9 @@ void request(WriteResultPublisher publisher, long n) {
 			@Override
 			void publishComplete(WriteResultPublisher publisher) {
 				publisher.completedBeforeSubscribed = true;
+				if(State.SUBSCRIBED.equals(publisher.state.get())) {
+					publisher.state.get().publishComplete(publisher);
+				}
 			}
 			@Override
 			void publishError(WriteResultPublisher publisher, Throwable ex) {