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/02/22 13:50:50 UTC
[1/2] camel git commit: Polished
Repository: camel
Updated Branches:
refs/heads/master a23bd9cc5 -> c60845053
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2c77b51e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2c77b51e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2c77b51e
Branch: refs/heads/master
Commit: 2c77b51ee85a3b74dcf3b0f21358f415f428553f
Parents: a23bd9c
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 22 10:12:24 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 22 10:12:24 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/processor/RedeliveryErrorHandler.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2c77b51e/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
index bdc9346..af3372b 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
@@ -1368,8 +1368,8 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// determine if redeliver is enabled or not
redeliveryEnabled = determineIfRedeliveryIsEnabled();
- if (log.isDebugEnabled()) {
- log.debug("Redelivery enabled: {} on error handler: {}", redeliveryEnabled, this);
+ if (log.isTraceEnabled()) {
+ log.trace("Redelivery enabled: {} on error handler: {}", redeliveryEnabled, this);
}
// we only need thread pool if redelivery is enabled
@@ -1378,8 +1378,8 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// use default shared executor service
executorService = camelContext.getErrorHandlerExecutorService();
}
- if (log.isTraceEnabled()) {
- log.trace("Using ExecutorService: {} for redeliveries on error handler: {}", executorService, this);
+ if (log.isDebugEnabled()) {
+ log.debug("Using ExecutorService: {} for redeliveries on error handler: {}", executorService, this);
}
}
[2/2] camel git commit: Upgrade groovy
Posted by da...@apache.org.
Upgrade groovy
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c6084505
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c6084505
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c6084505
Branch: refs/heads/master
Commit: c60845053a312e7e9ef8177bee47937a02a8f204
Parents: 2c77b51
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 22 13:50:44 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 22 13:50:44 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c6084505/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 003079b..4d51a25 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -208,7 +208,7 @@
<google-api-services-mail-version>v1-rev15-1.19.0</google-api-services-mail-version>
<google-truth-version>0.27</google-truth-version>
<grizzly-websockets-version>2.3.24</grizzly-websockets-version>
- <groovy-version>2.4.5</groovy-version>
+ <groovy-version>2.4.6</groovy-version>
<gson-version>2.6.1</gson-version>
<guice3-version>3.0</guice3-version>
<guice-version>4.0</guice-version>