Repository: camel Updated Branches: refs/heads/camel-2.12.x 60d60e825 -> 775aa07c0 refs/heads/camel-2.13.x 86be25f51 -> e4c1f8e0f
CAMEL-7359 fixed the same issue with headerAs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e4c1f8e0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e4c1f8e0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e4c1f8e0 Branch: refs/heads/camel-2.13.x Commit: e4c1f8e0fd783159f1e6bb7f06befbf6d19a0f20 Parents: 86be25f Author: Willem Jiang <[email protected]> Authored: Sat Apr 12 12:15:49 2014 +0800 Committer: Willem Jiang <[email protected]> Committed: Sat Apr 12 12:21:29 2014 +0800 ---------------------------------------------------------------------- .../camel/language/simple/ast/SimpleFunctionExpression.java | 3 ++- .../java/org/apache/camel/language/simple/SimpleTest.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e4c1f8e0/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java b/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java index 32a22b2..4eedcba 100644 --- a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java +++ b/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java @@ -238,7 +238,8 @@ public class SimpleFunctionExpression extends LiteralExpression { String key = ObjectHelper.before(keyAndType, ","); String type = ObjectHelper.after(keyAndType, ","); - if (ObjectHelper.isEmpty(key) || ObjectHelper.isEmpty(type)) { + remainder = ObjectHelper.after(remainder, ")"); + if (ObjectHelper.isEmpty(key) || ObjectHelper.isEmpty(type) || ObjectHelper.isNotEmpty(remainder)) { throw new SimpleParserException("Valid syntax: ${headerAs(key, type)} was: " + function, token.getIndex()); } key = StringHelper.removeQuotes(key); http://git-wip-us.apache.org/repos/asf/camel/blob/e4c1f8e0/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 53dae26..4e927b9 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 @@ -576,6 +576,13 @@ public class SimpleTest extends LanguageTestSupport { } catch (ExpressionIllegalSyntaxException e) { assertTrue(e.getMessage().startsWith("Valid syntax: ${headerAs(key, type)} was: headerAs(unknown String)")); } + + try { + assertExpression("${headerAs(fool,String).test}", null); + fail("Should have thrown an exception"); + } catch (ExpressionIllegalSyntaxException e) { + assertTrue(e.getMessage().startsWith("Valid syntax: ${headerAs(key, type)} was: headerAs(fool,String).test")); + } try { assertExpression("${headerAs(bar,XXX)}", 123);
