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

Restore correct order of terminated flag check

Browse Source
This commit is contained in:
Dávid Karnok
2017-04-06 19:15:12 +02:00
committed by Rossen Stoyanchev
parent 43eea41dd6
commit 68cc57549a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java
View File

@@ -274,7 +274,10 @@ class ReactiveTypeHandler {
this.elementRef.lazySet(null);
return;
}
// Check terminal signal before processing element..
boolean isTerminated = this.terminated;
Object element = this.elementRef.get();
if (element != null) {
this.elementRef.lazySet(null);
@@ -291,7 +294,7 @@ class ReactiveTypeHandler {
}
}
if (this.terminated) {
if (isTerminated) {
this.done = true;
Throwable ex = this.error;
this.error = null;