Avoid unnecessary sorting in base ExceptionHandlerMethodResolvers

sbrannen · sbrannen · commit 570bdbd25351 · 2021-01-11T12:58:19.000+01:00
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver.java b/spring-messaging/src/main/java/org/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/spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java b/spring-web/src/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 {

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`*`
`35`	`35`	`* @author Rossen Stoyanchev`
`36`	`36`	`* @author Juergen Hoeller`
	`37`	`+ * @author Sam Brannen`
`37`	`38`	`* @since 4.0`
`38`	`39`	`*/`
`39`	`40`	`public abstract class AbstractExceptionHandlerMethodResolver {`
`@@ -138,7 +139,9 @@ private Method getMappedMethod(Class<? extends Throwable> exceptionType) {`
`138`	`139`	`}`
`139`	`140`	`}`
`140`	`141`	`if (!matches.isEmpty()) {`
`141`		`- matches.sort(new ExceptionDepthComparator(exceptionType));`
	`142`	`+ if (matches.size() > 1) {`
	`143`	`+ matches.sort(new ExceptionDepthComparator(exceptionType));`
	`144`	`+ }`
`142`	`145`	`return this.mappedMethods.get(matches.get(0));`
`143`	`146`	`}`
`144`	`147`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`	`*`
`40`	`40`	`* @author Rossen Stoyanchev`
`41`	`41`	`* @author Juergen Hoeller`
	`42`	`+ * @author Sam Brannen`
`42`	`43`	`* @since 3.1`
`43`	`44`	`*/`
`44`	`45`	`public class ExceptionHandlerMethodResolver {`
`@@ -179,7 +180,9 @@ private Method getMappedMethod(Class<? extends Throwable> exceptionType) {`
`179`	`180`	`}`
`180`	`181`	`}`
`181`	`182`	`if (!matches.isEmpty()) {`
`182`		`- matches.sort(new ExceptionDepthComparator(exceptionType));`
	`183`	`+ if (matches.size() > 1) {`
	`184`	`+ matches.sort(new ExceptionDepthComparator(exceptionType));`
	`185`	`+ }`
`183`	`186`	`return this.mappedMethods.get(matches.get(0));`
`184`	`187`	`}`
`185`	`188`	`else {`