Skip to content

Commit

Permalink
Extra isReady-onWritePossible after last write
Browse files Browse the repository at this point in the history
Closes gh-24050
  • Loading branch information
rstoyanchev committed Nov 22, 2019
1 parent 6c7250b commit 51b35e6
Showing 1 changed file with 17 additions and 3 deletions.
Expand Up @@ -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;
Expand Down Expand Up @@ -344,23 +353,28 @@ 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);
}
},

RECEIVED {
@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 {
if (processor.write(data)) {
if (processor.changeState(WRITING, REQUESTED)) {
processor.currentData = null;
if (processor.subscriberCompleted) {
processor.changeStateToComplete(REQUESTED);
processor.readyToCompleteAfterLastWrite = true;
processor.changeStateToReceived(REQUESTED);
}
else {
processor.writingPaused();
Expand Down

0 comments on commit 51b35e6

Please sign in to comment.