You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/06/06 03:19:37 UTC
[2/4] git commit: Applying: CAMEL-7478 Fixed the simple language OGNL
expression issue of length
Applying: CAMEL-7478 Fixed the simple language OGNL expression issue of length
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc90178f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc90178f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc90178f
Branch: refs/heads/camel-2.13.x
Commit: fc90178ffa9246f72aa25d33e377024b36408393
Parents: d42539c
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Jun 6 09:06:43 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jun 6 09:12:15 2014 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/component/bean/BeanInfo.java | 2 ++
.../main/java/org/apache/camel/language/bean/BeanExpression.java | 2 --
.../test/java/org/apache/camel/language/simple/SimpleTest.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fc90178f/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 53c1254..5b8804d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -228,6 +228,8 @@ public class BeanInfo {
List<ParameterInfo> lpi = new ArrayList<ParameterInfo>(1);
lpi.add(pi);
methodInfo = new MethodInfo(exchange.getContext(), pojo.getClass(), method, lpi, lpi, false, false);
+ // Need to update the message body to be pojo for the invocation
+ exchange.getIn().setBody(pojo);
} catch (NoSuchMethodException e) {
throw new MethodNotFoundException(exchange, pojo, "getClass");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fc90178f/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java b/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
index 1092f6e..3cbc2fa 100644
--- a/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
@@ -300,8 +300,6 @@ public class BeanExpression implements Expression, Predicate {
// prepare for next bean to invoke
beanToCall = result;
- // we need to set the result to the exchange for further processing
- resultExchange.getIn().setBody(result);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fc90178f/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 7713fb9..e59ebbd 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -146,12 +146,12 @@ public class SimpleTest extends LanguageTestSupport {
public void testBodyExpressionWithArray() throws Exception {
exchange.getIn().setBody(new MyClass());
- Expression exp = SimpleLanguage.simple("body.getMyArray");
+ Expression exp = SimpleLanguage.simple("body.myArray");
assertNotNull(exp);
Object val = exp.evaluate(exchange, Object.class);
assertIsInstanceOf(Object[].class, val);
- exp = SimpleLanguage.simple("body.getMyArray.length");
+ exp = SimpleLanguage.simple("body.myArray.length");
assertNotNull(exp);
val = exp.evaluate(exchange, Object.class);
assertIsInstanceOf(Integer.class, val);