Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve cancel handling in AbstractListenerReadPublisher

Browse Source 
Closes gh-30393
This commit is contained in:
rstoyanchev
2024-01-16 12:17:54 +00:00
parent e3f185a696
commit c4a34fa26c
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -123,7 +123,7 @@ public abstract class AbstractListenerReadPublisher<T> implements Publisher<T> {
}
/**
* Subclasses can call this method to delegate a contain notification when
* Subclasses can call this method to delegate a container notification when
* all data has been read.
*/
public void onAllDataRead() {
@@ -362,6 +362,12 @@ public abstract class AbstractListenerReadPublisher<T> implements Publisher<T> {
publisher.errorPending = ex;
publisher.handlePendingCompletionOrError();
}
@Override
<T> void cancel(AbstractListenerReadPublisher<T> publisher) {
publisher.completionPending = true;
publisher.handlePendingCompletionOrError();
}
},
NO_DEMAND {
@@ -435,6 +441,13 @@ public abstract class AbstractListenerReadPublisher<T> implements Publisher<T> {
publisher.errorPending = ex;
publisher.handlePendingCompletionOrError();
}
@Override
<T> void cancel(AbstractListenerReadPublisher<T> publisher) {
publisher.discardData();
publisher.completionPending = true;
publisher.handlePendingCompletionOrError();
}
},
COMPLETED {