From 529f8ba78635e843d1f815002aac152361f66dd0 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Fri, 22 Nov 2019 15:55:44 +0000
Subject: [PATCH] Extra isReady-onWritePossible after last write

Closes gh-24050
---
 .../AbstractListenerWriteProcessor.java       | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
index 4f05d5e1e091..3f37a9558068 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
@@ -62,8 +62,17 @@ public abstract class AbstractListenerWriteProcessor<T> implements Processor<T,
 	@Nullable
 	private volatile T currentData;
 
+	/* Indicates "onComplete" was received during the (last) write. */
 	private volatile boolean subscriberCompleted;
 
+	/**
+	 * Indicates we're waiting for one last isReady-onWritePossible cycle
+	 * after "onComplete" because some Servlet containers expect this to take
+	 * place prior to calling AsyncContext.complete().
+	 * See https://github.com/eclipse-ee4j/servlet-api/issues/273
+	 */
+	private volatile boolean readyToCompleteAfterLastWrite;
+
 	private final WriteResultPublisher resultPublisher;
 
 	private final String logPrefix;
@@ -344,7 +353,8 @@ public <T> void onNext(AbstractListenerWriteProcessor<T> processor, T data) {
 			}
 			@Override
 			public <T> void onComplete(AbstractListenerWriteProcessor<T> processor) {
-				processor.changeStateToComplete(this);
+				processor.readyToCompleteAfterLastWrite = true;
+				processor.changeStateToReceived(this);
 			}
 		},
 
@@ -352,7 +362,10 @@ public <T> void onComplete(AbstractListenerWriteProcessor<T> processor) {
 			@SuppressWarnings("deprecation")
 			@Override
 			public <T> void onWritePossible(AbstractListenerWriteProcessor<T> processor) {
-				if (processor.changeState(this, WRITING)) {
+				if (processor.readyToCompleteAfterLastWrite) {
+					processor.changeStateToComplete(RECEIVED);
+				}
+				else if (processor.changeState(this, WRITING)) {
 					T data = processor.currentData;
 					Assert.state(data != null, "No data");
 					try {
@@ -360,7 +373,8 @@ public <T> void onWritePossible(AbstractListenerWriteProcessor<T> processor) {
 							if (processor.changeState(WRITING, REQUESTED)) {
 								processor.currentData = null;
 								if (processor.subscriberCompleted) {
-									processor.changeStateToComplete(REQUESTED);
+									processor.readyToCompleteAfterLastWrite = true;
+									processor.changeStateToReceived(REQUESTED);
 								}
 								else {
 									processor.writingPaused();