Avoid unnecessary sorting in base ExceptionHandlerMethodResolvers

spring-projects · Jan 11, 2021 · 570bdbd · 570bdbd
1 parent b587a16
commit 570bdbd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.../springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver.java b/.../springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver.java
@@ -34,6 +34,7 @@
  *
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 4.0
  */
 public abstract class AbstractExceptionHandlerMethodResolver {
@@ -138,7 +139,9 @@ private Method getMappedMethod(Class<? extends Throwable> exceptionType) {
 			}
 		}
 		if (!matches.isEmpty()) {
-			matches.sort(new ExceptionDepthComparator(exceptionType));
+			if (matches.size() > 1) {
+				matches.sort(new ExceptionDepthComparator(exceptionType));
+			}
 			return this.mappedMethods.get(matches.get(0));
 		}
 		else {

diff --git a/...c/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java b/...c/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java
@@ -39,6 +39,7 @@
  *
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 3.1
  */
 public class ExceptionHandlerMethodResolver {
@@ -179,7 +180,9 @@ private Method getMappedMethod(Class<? extends Throwable> exceptionType) {
 			}
 		}
 		if (!matches.isEmpty()) {
-			matches.sort(new ExceptionDepthComparator(exceptionType));
+			if (matches.size() > 1) {
+				matches.sort(new ExceptionDepthComparator(exceptionType));
+			}
 			return this.mappedMethods.get(matches.get(0));
 		}
 		else {