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:03 UTC
[1/4] git commit: Polished
Updated Branches:
refs/heads/camel-2.10.x eb74917c0 -> 8d2e138b9
refs/heads/camel-2.11.x 3b3e4728e -> b739a43cf
refs/heads/master 68af5745b -> 8aa6aa6c3
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/87357e87
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/87357e87
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/87357e87
Branch: refs/heads/master
Commit: 87357e87a5e42d2b4c5356632932ec1ef9eb7bd8
Parents: 68af574
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 4 08:57:58 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 4 08:57:58 2013 +0200
----------------------------------------------------------------------
.../camel/blueprint/BlueprintCamelContext.java | 4 ----
.../camel/blueprint/CamelEndpointFactoryBean.java | 1 -
.../blueprint/SSLContextParametersFactoryBean.java | 5 -----
3 files changed, 0 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/87357e87/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
index 33798ec..cded338 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
@@ -25,17 +25,13 @@ import org.apache.camel.core.osgi.utils.BundleDelegatingClassLoader;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.Registry;
-import org.apache.camel.util.ObjectHelper;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.container.BlueprintEvent;
import org.osgi.service.blueprint.container.BlueprintListener;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/camel/blob/87357e87/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelEndpointFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelEndpointFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelEndpointFactoryBean.java
index 9306bd4..8aa95c8 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelEndpointFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelEndpointFactoryBean.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.blueprint;
-
import java.util.Set;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
http://git-wip-us.apache.org/repos/asf/camel/blob/87357e87/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextParametersFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextParametersFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextParametersFactoryBean.java
index 3fa9af9..8879bbb 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextParametersFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextParametersFactoryBean.java
@@ -31,15 +31,10 @@ import org.osgi.service.blueprint.container.BlueprintContainer;
public class SSLContextParametersFactoryBean extends AbstractSSLContextParametersFactoryBean {
private KeyManagersParametersFactoryBean keyManagers;
-
private TrustManagersParametersFactoryBean trustManagers;
-
private SecureRandomParametersFactoryBean secureRandom;
-
private SSLContextClientParametersFactoryBean clientParameters;
-
private SSLContextServerParametersFactoryBean serverParameters;
-
@XmlTransient
private BlueprintContainer blueprintContainer;
[4/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.
Posted by da...@apache.org.
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/8d2e138b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8d2e138b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8d2e138b
Branch: refs/heads/camel-2.10.x
Commit: 8d2e138b9456c421b7dc0d21437e6125fcb9cf30
Parents: eb74917
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:48:43 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/8d2e138b/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 1b1d908..ed4f72a 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
@@ -178,6 +178,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();
@@ -1311,10 +1312,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;
}
[3/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.
Posted by da...@apache.org.
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/b739a43c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b739a43c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b739a43c
Branch: refs/heads/camel-2.11.x
Commit: b739a43cf172845b280871d52964c9c79414789b
Parents: 3b3e472
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:48:24 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/b739a43c/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 8789aa8..b059e86 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
@@ -180,6 +180,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();
@@ -1336,10 +1337,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;
}
[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.
Posted by da...@apache.org.
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;
}