Merge branch '5.3.x'

2022-02-03 14:58:36 +01:00
parent 5ad261228d f8a5a8d7be
commit 54565e95b5
91 changed files with 576 additions and 1059 deletions
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
@@ -125,16 +125,7 @@ public class ConcurrencyThrottleInterceptorTests {
 				try {
 					this.proxy.exceptional(this.ex);
 				}
-				catch (RuntimeException ex) {
-					if (ex == this.ex) {
-						logger.debug("Expected exception thrown", ex);
-					}
-					else {
-						// should never happen
-						ex.printStackTrace();
-					}
-				}
-				catch (Error err) {
+				catch (RuntimeException | Error err) {
 					if (err == this.ex) {
 						logger.debug("Expected exception thrown", err);
 					}