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 2012/02/08 03:15:20 UTC
svn commit: r1241737 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/language/simple/SimpleLanguage.java
test/java/org/apache/camel/language/simple/SimpleTest.java
Author: ningjiang
Date: Wed Feb 8 02:15:20 2012
New Revision: 1241737
URL: http://svn.apache.org/viewvc?rev=1241737&view=rev
Log:
CAMEL-4990 SimpleExpression should trim the string before parsing
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java?rev=1241737&r1=1241736&r2=1241737&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java Wed Feb 8 02:15:20 2012
@@ -126,6 +126,8 @@ public class SimpleLanguage implements L
}
public Predicate createPredicate(String expression) {
+ // trim the expression first
+ expression = expression.trim();
// support old simple language syntax
@SuppressWarnings("deprecation")
Predicate answer = SimpleBackwardsCompatibleParser.parsePredicate(expression);
@@ -138,6 +140,8 @@ public class SimpleLanguage implements L
}
public Expression createExpression(String expression) {
+ // trim the expression first
+ expression = expression.trim();
// support old simple language syntax
@SuppressWarnings("deprecation")
Expression answer = SimpleBackwardsCompatibleParser.parseExpression(expression);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java?rev=1241737&r1=1241736&r2=1241737&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java Wed Feb 8 02:15:20 2012
@@ -104,6 +104,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();