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 2016/12/05 13:12:36 UTC
[03/25] camel git commit: CAMEL-10559: route parser for java and xml
to parse source code. Donated from fabric8 project.
CAMEL-10559: route parser for java and xml to parse source code. Donated from fabric8 project.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c48c58ea
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c48c58ea
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c48c58ea
Branch: refs/heads/master
Commit: c48c58eaefc3b5c356423c8c816b254b7336aad8
Parents: b9e7ea8
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 5 12:44:15 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 5 14:04:48 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/parser/CamelJavaParserHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c48c58ea/tooling/route-parser/src/main/java/org/apache/camel/parser/CamelJavaParserHelper.java
----------------------------------------------------------------------
diff --git a/tooling/route-parser/src/main/java/org/apache/camel/parser/CamelJavaParserHelper.java b/tooling/route-parser/src/main/java/org/apache/camel/parser/CamelJavaParserHelper.java
index ca37a7a..5cd1e1c 100644
--- a/tooling/route-parser/src/main/java/org/apache/camel/parser/CamelJavaParserHelper.java
+++ b/tooling/route-parser/src/main/java/org/apache/camel/parser/CamelJavaParserHelper.java
@@ -592,7 +592,7 @@ public final class CamelJavaParserHelper {
Long num2 = val2 != null ? Long.valueOf(val2) : 0;
answer = "" + (num1 + num2);
} else {
- answer = val1 != null ? val1 : val2;
+ answer = (val1 != null ? val1 : "") + (val2 != null ? val2 : "");
}
if (!answer.isEmpty()) {