You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/10/12 08:31:22 UTC
[1/3] camel git commit: Upgrade Narayana to version 5.7.0.Final
Repository: camel
Updated Branches:
refs/heads/master 2439863b6 -> 390b4d78f
Upgrade Narayana to version 5.7.0.Final
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/da3cdc88
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/da3cdc88
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/da3cdc88
Branch: refs/heads/master
Commit: da3cdc882bd9398ed08449fde1fbc5392ed2371e
Parents: 2439863
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Oct 12 10:16:01 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Oct 12 10:16:01 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/da3cdc88/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2adef0d..6b0bf41 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -511,7 +511,7 @@
<mustache-bundle-version>0.9.5_1</mustache-bundle-version>
<mvel-version>2.3.2.Final</mvel-version>
<mybatis-version>3.4.5</mybatis-version>
- <narayana-version>5.6.4.Final</narayana-version>
+ <narayana-version>5.7.0.Final</narayana-version>
<neethi-bundle-version>3.0.1</neethi-bundle-version>
<nekohtml-version>1.9.22</nekohtml-version>
<neoscada-version>0.4.0</neoscada-version>
[2/3] camel git commit: Fix the problem of using '+' and '+='
operators to concatenate stringa in a loop.
Posted by ac...@apache.org.
Fix the problem of using '+' and '+=' operators to concatenate stringa in a loop.
The method is building a String using concatenation in a loop.
In each iteration, the String is converted to a StringBuilder, appended to, and converted back to a String.
This can lead to a cost quadratic in the number of iterations, as the growing string is recopied in each iteration.
Better performance can be obtained by using a StringBuilder explicitly.
http://findbugs.sourceforge.net/bugDescriptions.html#SBSC_USE_STRINGBUFFER_CONCATENATION
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/53dc6eaa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/53dc6eaa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/53dc6eaa
Branch: refs/heads/master
Commit: 53dc6eaa0275f213dbff24fda6c3daef556a23c1
Parents: da3cdc8
Author: Kui LIU <br...@gmail.com>
Authored: Wed Oct 11 10:18:11 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Oct 12 10:16:28 2017 +0200
----------------------------------------------------------------------
.../camel/impl/MappedEndpointConfiguration.java | 6 ++---
.../template/generated/ParseException.java | 26 ++++++++++----------
2 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/53dc6eaa/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java b/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
index b11091f..adbdde1 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
@@ -130,10 +130,10 @@ public final class MappedEndpointConfiguration extends DefaultEndpointConfigurat
}
queryParams.sort(null);
- String q = "";
+ StringBuilder q = new StringBuilder();
for (String entry : queryParams) {
- q += q.length() == 0 ? "" : "&";
- q += entry;
+ q.append(q.length() == 0 ? "" : "&");
+ q.append(entry);
}
StringBuilder u = new StringBuilder(64);
http://git-wip-us.apache.org/repos/asf/camel/blob/53dc6eaa/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java
index 8c562f1..5e1fe55 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/ParseException.java
@@ -102,29 +102,29 @@ public class ParseException extends Exception {
}
expected.append(eol).append(" ");
}
- String retval = "Encountered \"";
+ StringBuilder retval = new StringBuilder("Encountered \"");
Token tok = currentToken.next;
for (int i = 0; i < maxSize; i++) {
- if (i != 0) retval += " ";
+ if (i != 0) retval.append(" ");
if (tok.kind == 0) {
- retval += tokenImage[0];
+ retval.append(tokenImage[0]);
break;
}
- retval += " " + tokenImage[tok.kind];
- retval += " \"";
- retval += add_escapes(tok.image);
- retval += " \"";
+ retval.append(" ").append(tokenImage[tok.kind]);
+ retval.append(" \"");
+ retval.append(add_escapes(tok.image));
+ retval.append(" \"");
tok = tok.next;
}
- retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
- retval += "." + eol;
+ retval.append("\" at line ").append(currentToken.next.beginLine).append(", column ").append(currentToken.next.beginColumn);
+ retval.append(".").append(eol);
if (expectedTokenSequences.length == 1) {
- retval += "Was expecting:" + eol + " ";
+ retval.append("Was expecting:").append(eol).append(" ");
} else {
- retval += "Was expecting one of:" + eol + " ";
+ retval.append("Was expecting one of:").append(eol).append(" ");
}
- retval += expected.toString();
- return retval;
+ retval.append(expected.toString());
+ return retval.toString();
}
/**
[3/3] camel git commit: CAMEL-11894: camel-karaf-commands deployment
failed on karaf 4.0
Posted by ac...@apache.org.
CAMEL-11894: camel-karaf-commands deployment failed on karaf 4.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/390b4d78
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/390b4d78
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/390b4d78
Branch: refs/heads/master
Commit: 390b4d78f4d85283f3b05f7e983cf8494d254e8c
Parents: 53dc6ea
Author: Frédérik Rouleau <fr...@prosodie.com>
Authored: Wed Oct 11 10:39:53 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Oct 12 10:29:23 2017 +0200
----------------------------------------------------------------------
platforms/karaf/commands/pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/390b4d78/platforms/karaf/commands/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/pom.xml b/platforms/karaf/commands/pom.xml
index e737bc1..544e4d2 100644
--- a/platforms/karaf/commands/pom.xml
+++ b/platforms/karaf/commands/pom.xml
@@ -84,8 +84,7 @@
<instructions>
<Import-Package>
!org.apache.felix.utils.properties,
- org.apache.karaf.shell.api.action;version="[4,5)",
- org.apache.karaf.shell.support.completers;version="[4,5)",
+ org.apache.karaf.shell.*;version="[4,5)",
org.slf4j.*;version="[1.6,2)",
*
</Import-Package>