spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-30 03:09:03 +00:00
Code Issues Projects Releases Wiki Activity

Join identical catch branches

Browse Source 
See gh-2052
This commit is contained in:
igor-suhorukov
2018-12-25 09:46:11 +01:00
committed by Stephane Nicoll
parent 93e7a0a59d
commit a218bf40cd
5 changed files with 16 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
+1 -9
View File
@@ -272,15 +272,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
}
}
}
catch (AmbiguousBindingException ambigEx) {
if (this.raiseExceptions) {
throw ambigEx;
}
else {
return null;
}
}
catch (IllegalArgumentException ex) {
catch (AmbiguousBindingException | IllegalArgumentException ex) {
if (this.raiseExceptions) {
throw ex;
}