You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/12/02 19:48:21 UTC
[1/2] camel git commit: CAMEL-8099: Add support for using default
values in Camel property placeholder.:
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x f7b4bedf2 -> 9334a870c
refs/heads/master c4d6eb333 -> 7ffb70e2b
CAMEL-8099: Add support for using default values in Camel property placeholder.:
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7ffb70e2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7ffb70e2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7ffb70e2
Branch: refs/heads/master
Commit: 7ffb70e2bd48f401b183c4f97b482f9a324e5045
Parents: c4d6eb3
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 2 19:47:26 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 2 19:47:26 2014 +0100
----------------------------------------------------------------------
.../camel/language/simple/ast/SimpleFunctionExpression.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7ffb70e2/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 d5b648a..d63e854 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
@@ -166,13 +166,13 @@ public class SimpleFunctionExpression extends LiteralExpression {
remainder = ifStartsWithReturnRemainder("properties-location:", function);
if (remainder != null) {
String[] parts = remainder.split(":");
- if (parts.length > 2) {
+ if (parts.length > 3) {
throw new SimpleParserException("Valid syntax: ${properties-location:location:key[:default]} was: " + function, token.getIndex());
}
String locations = null;
String key = remainder;
- if (parts.length == 2) {
+ if (parts.length >= 2) {
locations = ObjectHelper.before(remainder, ":");
key = ObjectHelper.after(remainder, ":");
}
[2/2] camel git commit: CAMEL-8099: Add support for using default
values in Camel property placeholder.:
Posted by da...@apache.org.
CAMEL-8099: Add support for using default values in Camel property placeholder.:
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9334a870
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9334a870
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9334a870
Branch: refs/heads/camel-2.14.x
Commit: 9334a870c546e7c6e15a99bddb26874bf914d5cb
Parents: f7b4bed
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 2 19:47:26 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 2 19:48:09 2014 +0100
----------------------------------------------------------------------
.../camel/language/simple/ast/SimpleFunctionExpression.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9334a870/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 d5b648a..d63e854 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
@@ -166,13 +166,13 @@ public class SimpleFunctionExpression extends LiteralExpression {
remainder = ifStartsWithReturnRemainder("properties-location:", function);
if (remainder != null) {
String[] parts = remainder.split(":");
- if (parts.length > 2) {
+ if (parts.length > 3) {
throw new SimpleParserException("Valid syntax: ${properties-location:location:key[:default]} was: " + function, token.getIndex());
}
String locations = null;
String key = remainder;
- if (parts.length == 2) {
+ if (parts.length >= 2) {
locations = ObjectHelper.before(remainder, ":");
key = ObjectHelper.after(remainder, ":");
}