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 2013/06/04 09:49:04 UTC
[2/4] git commit: CAMEL-6421: Use a private lock for
getErrorHandlerExecutorService() to avoid any hang during shutdown
route/camel when multiple threads is in use.
CAMEL-6421: Use a private lock for getErrorHandlerExecutorService() to avoid any hang during shutdown route/camel when multiple threads is in use.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8aa6aa6c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8aa6aa6c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8aa6aa6c
Branch: refs/heads/master
Commit: 8aa6aa6c3f423ab7e454bd81db22f83ba466b964
Parents: 87357e8
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 4 09:29:28 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 4 09:29:28 2013 +0200
----------------------------------------------------------------------
.../org/apache/camel/impl/DefaultCamelContext.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8aa6aa6c/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index ecee677..56a5504 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -184,6 +184,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
private Boolean useBreadcrumb = Boolean.TRUE;
private Long delay;
private ErrorHandlerFactory errorHandlerBuilder;
+ private final Object errorHandlerExecutorServiceLock = new Object();
private ScheduledExecutorService errorHandlerExecutorService;
private Map<String, DataFormatDefinition> dataFormats = new HashMap<String, DataFormatDefinition>();
private DataFormatResolver dataFormatResolver = new DefaultDataFormatResolver();
@@ -1358,10 +1359,12 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
this.errorHandlerBuilder = errorHandlerBuilder;
}
- public synchronized ScheduledExecutorService getErrorHandlerExecutorService() {
- if (errorHandlerExecutorService == null) {
- // setup default thread pool for error handler
- errorHandlerExecutorService = getExecutorServiceManager().newDefaultScheduledThreadPool("ErrorHandlerRedeliveryThreadPool", "ErrorHandlerRedeliveryTask");
+ public ScheduledExecutorService getErrorHandlerExecutorService() {
+ synchronized (errorHandlerExecutorServiceLock) {
+ if (errorHandlerExecutorService == null) {
+ // setup default thread pool for error handler
+ errorHandlerExecutorService = getExecutorServiceManager().newDefaultScheduledThreadPool("ErrorHandlerRedeliveryThreadPool", "ErrorHandlerRedeliveryTask");
+ }
}
return errorHandlerExecutorService;
}