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

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-05-16 09:29:02 +02:00
parent 1f551e9e9c ba2e9cccf7
commit 9ea4fce03e
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandler.java
View File

@ -121,18 +121,15 @@ public class DefaultErrorWebExceptionHandler extends AbstractErrorWebExceptionHa
HttpStatus errorStatus = getHttpStatus(error); HttpStatus errorStatus = getHttpStatus(error);
ServerResponse.BodyBuilder responseBody = ServerResponse.status(errorStatus) ServerResponse.BodyBuilder responseBody = ServerResponse.status(errorStatus)
.contentType(MediaType.TEXT_HTML); .contentType(MediaType.TEXT_HTML);
Flux<ServerResponse> result = Flux return Flux
.just("error/" + errorStatus.toString(), .just("error/" + errorStatus.toString(),
"error/" + SERIES_VIEWS.get(errorStatus.series()), "error/error") "error/" + SERIES_VIEWS.get(errorStatus.series()), "error/error")
.flatMap((viewName) -> renderErrorView(viewName, responseBody, error)); .flatMap((viewName) -> renderErrorView(viewName, responseBody, error))
if (this.errorProperties.getWhitelabel().isEnabled()) { .switchIfEmpty(
result = result.switchIfEmpty(renderDefaultErrorView(responseBody, error)); this.errorProperties.getWhitelabel().isEnabled()
} ? renderDefaultErrorView(responseBody, error)
else { : Mono.error(getError(request)))
Throwable ex = getError(request); .next().doOnNext((response) -> logError(request, errorStatus));
result = result.switchIfEmpty(Mono.error(ex));
}
return result.next().doOnNext((response) -> logError(request, errorStatus));
} }
/** /**