Author: ningjiang
Date: Wed Feb  8 06:17:12 2012
New Revision: 1241786

URL: http://svn.apache.org/viewvc?rev=1241786&view=rev
Log:
Merged revisions 1241737 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1241737 | ningjiang | 2012-02-08 10:15:20 +0800 (Wed, 08 Feb 2012) | 1 line
  
  CAMEL-4990 SimpleExpression should trim the string before parsing
........

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
    
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  8 06:17:12 2012
@@ -1 +1 @@
-/camel/trunk:1235643,1236639,1236667,1237666,1237807,1238225,1238229,1238387,1238463,1238477,1238503,1238937,1238988,1239006,1239045,1239080-1239081,1239470,1239479,1239497,1240025,1240063,1240950,1241482,1241485
+/camel/trunk:1235643,1236639,1236667,1237666,1237807,1238225,1238229,1238387,1238463,1238477,1238503,1238937,1238988,1239006,1239045,1239080-1239081,1239470,1239479,1239497,1240025,1240063,1240950,1241482,1241485,1241737

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java?rev=1241786&r1=1241785&r2=1241786&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
 Wed Feb  8 06:17:12 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/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java?rev=1241786&r1=1241785&r2=1241786&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
 Wed Feb  8 06:17:12 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();


Reply via email to