root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Ensure NPE will not be thrown when cancelling a subscription 

Issue: SPR-15393
This commit is contained in:
Violeta Georgieva 2017-03-28 14:08:13 +03:00 committed by Arjen Poutsma
parent dea4825a9f
commit 2556178422
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.java
View File

@ -98,7 +98,9 @@ public abstract class AbstractListenerWriteFlushProcessor<T> implements Processo
* Listeners can call this method to cancel further writing.
*/
protected void cancel() {
this.subscription.cancel();
if (this.subscription != null) {
this.subscription.cancel();
}
}

4
spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
View File

@ -111,7 +111,9 @@ public abstract class AbstractListenerWriteProcessor<T> implements Processor<T,
* Listeners can call this method to cancel further writing.
*/
public void cancel() {
this.subscription.cancel();
if (this.subscription != null) {
this.subscription.cancel();
}
}