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

@ExceptionHandler resolves nested exceptions 

See gh-23380
This commit is contained in:
Rossen Stoyanchev 2020-05-12 12:57:42 +01:00
parent a16d178d72
commit b31f2bdad2
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -134,7 +134,7 @@ public class ExceptionHandlerMethodResolver {
if (method == null) { if (method == null) {
Throwable cause = exception.getCause(); Throwable cause = exception.getCause();
if (cause != null) { if (cause != null) {
method = resolveMethodByExceptionType(cause.getClass()); method = resolveMethodByThrowable(cause);
} }
} }
return method; return method;

14
spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -78,6 +78,18 @@ public class ExceptionHandlerMethodResolverTests {
assertThat(resolver.resolveMethod(exception)).as("2nd lookup from cache").isNull(); assertThat(resolver.resolveMethod(exception)).as("2nd lookup from cache").isNull();
} }
@Test
public void resolveMethodExceptionCause() {
ExceptionHandlerMethodResolver resolver = new ExceptionHandlerMethodResolver(ExceptionController.class);
SocketException bindException = new BindException();
bindException.initCause(new FileNotFoundException());
Exception exception = new Exception(new Exception(new Exception(bindException)));
assertThat(resolver.resolveMethod(exception).getName()).isEqualTo("handleSocketException");
}
@Test @Test
public void resolveMethodInherited() { public void resolveMethodInherited() {
ExceptionHandlerMethodResolver resolver = new ExceptionHandlerMethodResolver(InheritedController.class); ExceptionHandlerMethodResolver resolver = new ExceptionHandlerMethodResolver(InheritedController.class);