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

Polishing

This commit is contained in:
rstoyanchev 2022-07-13 11:27:51 +01:00
parent 89f66ccf6a
commit 3badc47647
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityExceptionHandler.java
View File

@ -81,8 +81,6 @@ public abstract class ResponseEntityExceptionHandler {
ErrorResponseException.class ErrorResponseException.class
}) })
public final Mono<ResponseEntity<Object>> handleException(Exception ex, ServerWebExchange exchange) { public final Mono<ResponseEntity<Object>> handleException(Exception ex, ServerWebExchange exchange) {
HttpHeaders headers = new HttpHeaders();
if (ex instanceof MethodNotAllowedException theEx) { if (ex instanceof MethodNotAllowedException theEx) {
return handleMethodNotAllowedException(theEx, theEx.getHeaders(), theEx.getStatusCode(), exchange); return handleMethodNotAllowedException(theEx, theEx.getHeaders(), theEx.getStatusCode(), exchange);
} }

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

@ -109,8 +109,6 @@ public abstract class ResponseEntityExceptionHandler {
}) })
@Nullable @Nullable
public final ResponseEntity<Object> handleException(Exception ex, WebRequest request) throws Exception { public final ResponseEntity<Object> handleException(Exception ex, WebRequest request) throws Exception {
HttpHeaders headers = new HttpHeaders();
if (ex instanceof HttpRequestMethodNotSupportedException subEx) { if (ex instanceof HttpRequestMethodNotSupportedException subEx) {
return handleHttpRequestMethodNotSupported(subEx, subEx.getHeaders(), subEx.getStatusCode(), request); return handleHttpRequestMethodNotSupported(subEx, subEx.getHeaders(), subEx.getStatusCode(), request);
} }
@ -147,6 +145,7 @@ public abstract class ResponseEntityExceptionHandler {
// Lower level exceptions, and exceptions used symmetrically on client and server // Lower level exceptions, and exceptions used symmetrically on client and server
HttpHeaders headers = new HttpHeaders();
if (ex instanceof ConversionNotSupportedException theEx) { if (ex instanceof ConversionNotSupportedException theEx) {
return handleConversionNotSupported(theEx, headers, HttpStatus.INTERNAL_SERVER_ERROR, request); return handleConversionNotSupported(theEx, headers, HttpStatus.INTERNAL_SERVER_ERROR, request);
} }