INT-506

org.springframework.integration/src/main/java/org/springframework/integration/handler/HandlerMethodUtils.java

@@ -25,7 +25,6 @@ import java.util.List;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.integration.annotation.Header;
 import org.springframework.integration.annotation.Headers;
-import org.springframework.util.ReflectionUtils;
 
 /**
  * Utility methods for common behavior related to Message-handling methods.
@@ -73,13 +72,11 @@ abstract class HandlerMethodUtils {
 		if (clazz == null) {
 			clazz = object.getClass();
 		}
-		ReflectionUtils.doWithMethods(clazz, new ReflectionUtils.MethodCallback() {
-			public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
-				if (HandlerMethodUtils.isValidHandlerMethod(method)) {
-					candidates.add(method);
-				}
+		for (Method method : clazz.getMethods()) {
+			if (HandlerMethodUtils.isValidHandlerMethod(method)) {
+				candidates.add(method);
 			}
-		});
+		}
 		return candidates.toArray(new Method[candidates.size()]);
 	}
 

org.springframework.integration/src/test/java/org/springframework/integration/handler/HandlerMethodInheritanceTests.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.handler;
+
+import static org.junit.Assert.assertEquals;
+
+import java.lang.reflect.Method;
+
+import org.junit.Test;
+
+import org.springframework.integration.message.StringMessage;
+import org.springframework.util.ReflectionUtils;
+
+/**
+ * @author Mark Fisher
+ */
+public class HandlerMethodInheritanceTests {
+
+	@Test // INT-506
+	public void overriddenMethodExcludedFromCandidateList() {
+		Method[] candidates = HandlerMethodUtils.getCandidateHandlerMethods(new TestSubclass());
+		assertEquals(1, candidates.length);
+		Method expected = ReflectionUtils.findMethod(
+				TestSubclass.class, "test", new Class<?>[] { String.class });
+		assertEquals(expected, candidates[0]);
+	}
+
+	@Test // INT-506
+	public void overridingMethodResolves() {
+		Method[] candidates = HandlerMethodUtils.getCandidateHandlerMethods(new TestSubclass());
+		PayloadTypeMatchingHandlerMethodResolver resolver = new PayloadTypeMatchingHandlerMethodResolver(candidates);
+		Method resolved = resolver.resolveHandlerMethod(new StringMessage("test"));
+		Method expected = ReflectionUtils.findMethod(
+				TestSubclass.class, "test", new Class<?>[] { String.class });
+		assertEquals(expected, resolved);
+	}
+
+
+	public static class TestSuperclass {
+
+		public void test(String s) {
+		}
+	}
+
+
+	public static class TestSubclass extends TestSuperclass {
+
+		public void test(String s) {
+		}
+	}
+
+}