Author: davsclaus
Date: Wed Oct 15 11:07:36 2008
New Revision: 704979
URL: http://svn.apache.org/viewvc?rev=704979&view=rev
Log:
CAMEL-983: revert to not break unit tests in camel-spring
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=704979&r1=704978&r2=704979&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
Wed Oct 15 11:07:36 2008
@@ -144,7 +144,7 @@
MethodInfo methodInfo = createMethodInfo(clazz, method);
// skip methods that override existing methods we already have in our
methodMap
- // TODO: davsclaus this breaks camel-spring test (CAMEL-983)
+ // TODO: CAMEL-983
/*if (overridesExistingMethod(methodInfo)) {
if (LOG.isTraceEnabled()) {
LOG.trace("This method is already overriden in a subclass, so
its skipped: " + method);
@@ -156,7 +156,6 @@
LOG.trace("Adding operation: " + opName + " for method: " +
methodInfo);
}
operations.put(opName, methodInfo);
- methodMap.put(method, methodInfo);
if (methodInfo.hasBodyParameter()) {
operationsWithBody.add(methodInfo);
@@ -165,6 +164,9 @@
operationsWithCustomAnnotation.add(methodInfo);
}
+ // must add to method map last otherwise we break stuff
+ methodMap.put(method, methodInfo);
+
return methodInfo;
}