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 2018/09/24 12:43:43 UTC
[camel] branch camel-2.22.x updated: CAMEL-12829: An autocreated
CXF Bus not shut down in CxfSpringEndpoint (#2530)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.22.x by this push:
new a265751 CAMEL-12829: An autocreated CXF Bus not shut down in CxfSpringEndpoint (#2530)
a265751 is described below
commit a2657516fbaeaba3f2ad3de8b5e39e0d0e13575b
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Mon Sep 24 14:40:41 2018 +0200
CAMEL-12829: An autocreated CXF Bus not shut down in CxfSpringEndpoint (#2530)
---
.../src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java | 2 +-
.../src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 58051c2..90516be 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -128,7 +128,7 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
protected Bus bus;
private AtomicBoolean getBusHasBeenCalled = new AtomicBoolean(false);
- private volatile boolean createBus;
+ protected volatile boolean createBus;
private BindingConfiguration bindingConfig;
private DataBinding dataBinding;
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
index cc67660..1e4b9ec 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
@@ -286,6 +286,7 @@ public class CxfSpringEndpoint extends CxfEndpoint implements ApplicationContext
applicationContext = ctx;
if (bus == null) {
+ createBus = true;
bus = BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx);
}
}