From e4179553b6e8610417b06f57ffaa478fd978d18f Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Wed, 13 Jul 2016 15:42:34 +0200
Subject: [PATCH] AbstractHandlerMethodMapping adds type+method info to
 getMappingForMethod exceptions

Issue: SPR-14452
(cherry picked from commit f0a826e)
---
 .../web/servlet/handler/AbstractHandlerMethodMapping.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
index d84d1601f9d..2ce03f153d1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
@@ -230,7 +230,13 @@ public abstract class AbstractHandlerMethodMapping<T> extends AbstractHandlerMap
 				new MethodIntrospector.MetadataLookup<T>() {
 					@Override
 					public T inspect(Method method) {
-						return getMappingForMethod(method, userType);
+						try {
+							return getMappingForMethod(method, userType);
+						}
+						catch (Throwable ex) {
+							throw new IllegalStateException("Invalid mapping on handler class [" +
+									userType.getName() + "]: " + method, ex);
+						}
 					}
 				});