Merge branch '6.1.x'

sdeleuze · sdeleuze · commit e66d965feddb · 2024-03-08T09:25:17.000+01:00
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/HandlerMethodValidationException.java b/spring-web/src/main/java/org/springframework/web/method/annotation/HandlerMethodValidationException.java
@@ -77,7 +77,7 @@ public HandlerMethodValidationException(MethodValidationResult validationResult,
 	}
 
 	private static HttpStatus initHttpStatus(MethodValidationResult validationResult) {
-		return (!validationResult.isForReturnValue() ? HttpStatus.BAD_REQUEST : HttpStatus.INTERNAL_SERVER_ERROR);
+		return (validationResult.isForReturnValue() ? HttpStatus.INTERNAL_SERVER_ERROR : HttpStatus.BAD_REQUEST);
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public HandlerMethodValidationException(MethodValidationResult validationResult,`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`private static HttpStatus initHttpStatus(MethodValidationResult validationResult) {`
`80`		`- return (!validationResult.isForReturnValue() ? HttpStatus.BAD_REQUEST : HttpStatus.INTERNAL_SERVER_ERROR);`
	`80`	`+ return (validationResult.isForReturnValue() ? HttpStatus.INTERNAL_SERVER_ERROR : HttpStatus.BAD_REQUEST);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`