Author: davsclaus
Date: Fri Sep 2 09:39:52 2011
New Revision: 1164440
URL: http://svn.apache.org/viewvc?rev=1164440&view=rev
Log:
Merged revisions 1153620 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
Added:
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/language/BeanAnnotationParameterTest.java
- copied unchanged from r1153620,
camel/trunk/camel-core/src/test/java/org/apache/camel/language/BeanAnnotationParameterTest.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/language/BeanAnnotationParameterTwoTest.java
- copied unchanged from r1153620,
camel/trunk/camel-core/src/test/java/org/apache/camel/language/BeanAnnotationParameterTwoTest.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 2 09:39:52 2011
@@ -1 +1 @@
-/camel/trunk:1150651,1151054,1152170,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395
+/camel/trunk:1150651,1151054,1152170,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=1164440&r1=1164439&r2=1164440&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
Fri Sep 2 09:39:52 2011
@@ -348,6 +348,13 @@ public class MethodInfo {
if
(exchange.getIn().getHeader(Exchange.BEAN_MULTI_PARAMETER_ARRAY) != null) {
multiParameterArray =
exchange.getIn().getHeader(Exchange.BEAN_MULTI_PARAMETER_ARRAY, Boolean.class);
}
+ // remove headers as they should not be propagated
+ // we need to do this before the expressions gets evaluated as
it may contain
+ // a @Bean expression which would by mistake read these
headers. So the headers
+ // must be removed at this point of time
+
exchange.getIn().removeHeader(Exchange.BEAN_MULTI_PARAMETER_ARRAY);
+ exchange.getIn().removeHeader(Exchange.BEAN_METHOD_NAME);
+
for (int i = 0; i < size; i++) {
Object value = null;
if (multiParameterArray) {
