Author: ningjiang
Date: Wed Feb 8 08:30:26 2012
New Revision: 1241814
URL: http://svn.apache.org/viewvc?rev=1241814&view=rev
Log:
CAMEL-4990 SimpleExpression should trim the string before parsing
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java?rev=1241814&r1=1241813&r2=1241814&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
Wed Feb 8 08:30:26 2012
@@ -112,6 +112,7 @@ public class SimpleLanguage extends Simp
@Override
public Expression createExpression(String expression) {
+ expression = expression.trim();
Expression answer = super.createExpression(expression);
if (resultType != null) {
return ExpressionBuilder.convertToExpression(answer, resultType);
Modified:
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java?rev=1241814&r1=1241813&r2=1241814&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java
Wed Feb 8 08:30:26 2012
@@ -102,6 +102,13 @@ public class SimpleTest extends Language
assertExpression("header.foo", "abc");
assertExpression("headers.foo", "abc");
}
+
+ public void testTrimSimpleExpressions() throws Exception {
+ assertExpression(" \texchangeId\n", exchange.getExchangeId());
+ assertExpression("\nid\r", exchange.getIn().getMessageId());
+ assertExpression("\t\r body", "<hello id='m123'>world!</hello>");
+ assertExpression("\nin.body\r", "<hello id='m123'>world!</hello>");
+ }
public void testSimpleThreadName() throws Exception {
String name = Thread.currentThread().getName();