restored getMostSpecificMethod's traversal of the inheritance hierarchy

Author: jhoeller

org.springframework.core/src/main/java/org/springframework/util/ClassUtils.java

@@ -689,18 +689,12 @@ public static boolean hasAtLeastOneMethodWithName(Class clazz, String methodName
 	 * <code>targetClass</code> doesn't implement it or is <code>null</code>
 	 */
 	public static Method getMostSpecificMethod(Method method, Class targetClass) {
-		Method result = method;
+		Method specificMethod = null;
 		if (method != null && !Modifier.isPrivate(method.getModifiers()) &&
 				targetClass != null && !targetClass.equals(method.getDeclaringClass())) {
-			try {
-				result = targetClass.getDeclaredMethod(method.getName(), method.getParameterTypes());
-			}
-			catch (NoSuchMethodException ex) {
-				// Perhaps the target class doesn't implement this method:
-				// that's fine, just use the original method.
-			}
+			specificMethod = ReflectionUtils.findMethod(targetClass, method.getName(), method.getParameterTypes());
 		}
-		return result;
+		return (specificMethod != null ? specificMethod : method);
 	}
 
 	/**
@@ -716,14 +710,11 @@ public static Method getStaticMethod(Class clazz, String methodName, Class... ar
 		Assert.notNull(methodName, "Method name must not be null");
 		try {
 			Method method = clazz.getDeclaredMethod(methodName, args);
-			if ((method.getModifiers() & Modifier.STATIC) != 0) {
-				return method;
-			}
+			return ((method.getModifiers() & Modifier.STATIC) != 0 ? method : null);
 		}
 		catch (NoSuchMethodException ex) {
 			return null;
 		}
-		return null;
 	}
 
 

org.springframework.web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java

@@ -72,18 +72,19 @@ public class HandlerMethodResolver {
 	 */
 	public void init(Class<?> handlerType) {
 		Class<?>[] handlerTypes =
-				Proxy.isProxyClass(handlerType) ? handlerType.getInterfaces() : new Class<?>[]{handlerType};
+				Proxy.isProxyClass(handlerType) ? handlerType.getInterfaces() : new Class<?>[] {handlerType};
 		for (final Class<?> currentHandlerType : handlerTypes) {
 			ReflectionUtils.doWithMethods(currentHandlerType, new ReflectionUtils.MethodCallback() {
 				public void doWith(Method method) {
-					if (isHandlerMethod(ClassUtils.getMostSpecificMethod(method, currentHandlerType))) {
-						handlerMethods.add(ClassUtils.getMostSpecificMethod(method, currentHandlerType));
+					Method specificMethod = ClassUtils.getMostSpecificMethod(method, currentHandlerType);
+					if (isHandlerMethod(specificMethod)) {
+						handlerMethods.add(specificMethod);
 					}
 					else if (method.isAnnotationPresent(InitBinder.class)) {
-						initBinderMethods.add(ClassUtils.getMostSpecificMethod(method, currentHandlerType));
+						initBinderMethods.add(specificMethod);
 					}
 					else if (method.isAnnotationPresent(ModelAttribute.class)) {
-						modelAttributeMethods.add(ClassUtils.getMostSpecificMethod(method, currentHandlerType));
+						modelAttributeMethods.add(specificMethod);
 					}
 				}
 			});