You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/04/03 14:54:13 UTC
[camel] branch main updated (08c89e34d1d -> 5053b173622)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 08c89e34d1d Added test case
new f20e20b0ec6 CAMEL-15105: move ExchangeFactory ownership to the context extension
new eedaeb8b4bc CAMEL-15105: move ProcessorExchangeFactory ownership to the context extension
new 5053b173622 CAMEL-15105: move ExchangeFactoryManager ownership to the context extension
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/impl/engine/AbstractCamelContext.java | 14 ---------
.../impl/engine/DefaultCamelContextExtension.java | 33 ++++++++++++----------
2 files changed, 18 insertions(+), 29 deletions(-)
[camel] 01/03: CAMEL-15105: move ExchangeFactory ownership to the context extension
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f20e20b0ec66fb14a89019f0f8025e668a2ba4f7
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 3 14:50:15 2023 +0200
CAMEL-15105: move ExchangeFactory ownership to the context extension
---
.../org/apache/camel/impl/engine/AbstractCamelContext.java | 10 ----------
.../camel/impl/engine/DefaultCamelContextExtension.java | 11 ++++++-----
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 2799a4eb83a..d3c4ff7523e 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -207,7 +207,6 @@ public abstract class AbstractCamelContext extends BaseService
volatile DeferServiceFactory deferServiceFactory;
volatile AnnotationBasedProcessorFactory annotationBasedProcessorFactory;
volatile ExchangeFactoryManager exchangeFactoryManager;
- volatile ExchangeFactory exchangeFactory;
volatile ProcessorExchangeFactory processorExchangeFactory;
volatile ReactiveExecutor reactiveExecutor;
volatile Registry registry;
@@ -3288,7 +3287,6 @@ public abstract class AbstractCamelContext extends BaseService
typeConverterRegistry = null;
typeConverter = null;
reactiveExecutor = null;
- exchangeFactory = null;
exchangeFactoryManager = null;
processorExchangeFactory = null;
registry = null;
@@ -4144,14 +4142,6 @@ public abstract class AbstractCamelContext extends BaseService
return camelContextExtension.getDescription();
}
- public ProcessorExchangeFactory getProcessorExchangeFactory() {
- return camelContextExtension.getProcessorExchangeFactory();
- }
-
- public void setProcessorExchangeFactory(ProcessorExchangeFactory processorExchangeFactory) {
- camelContextExtension.setProcessorExchangeFactory(processorExchangeFactory);
- }
-
public FactoryFinder getBootstrapFactoryFinder() {
return camelContextExtension.getBootstrapFactoryFinder();
}
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
index 4d2dad49bcc..8212b1e7f94 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
@@ -80,6 +80,7 @@ class DefaultCamelContextExtension implements ExtendedCamelContext {
private final Set<LogListener> logListeners = new LinkedHashSet<>();
private final PluginManager pluginManager = new DefaultContextPluginManager();
private volatile String description;
+ private volatile ExchangeFactory exchangeFactory;
@Deprecated
private ErrorHandlerFactory errorHandlerFactory;
private String basePackageScan;
@@ -413,21 +414,21 @@ class DefaultCamelContextExtension implements ExtendedCamelContext {
@Override
public ExchangeFactory getExchangeFactory() {
- if (camelContext.exchangeFactory == null) {
- synchronized (camelContext.lock) {
- if (camelContext.exchangeFactory == null) {
+ if (exchangeFactory == null) {
+ synchronized (lock) {
+ if (exchangeFactory == null) {
setExchangeFactory(camelContext.createExchangeFactory());
}
}
}
- return camelContext.exchangeFactory;
+ return exchangeFactory;
}
@Override
public void setExchangeFactory(ExchangeFactory exchangeFactory) {
// automatic inject camel context
exchangeFactory.setCamelContext(camelContext);
- camelContext.exchangeFactory = exchangeFactory;
+ this.exchangeFactory = exchangeFactory;
}
@Override
[camel] 03/03: CAMEL-15105: move ExchangeFactoryManager ownership to the context extension
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5053b1736220f720df774145c8dfcdaa107a65ce
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 3 15:29:12 2023 +0200
CAMEL-15105: move ExchangeFactoryManager ownership to the context extension
---
.../org/apache/camel/impl/engine/AbstractCamelContext.java | 2 --
.../camel/impl/engine/DefaultCamelContextExtension.java | 11 ++++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index b343ddd8161..33b47e4dba8 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -206,7 +206,6 @@ public abstract class AbstractCamelContext extends BaseService
final RouteController internalRouteController = new InternalRouteController(this);
volatile DeferServiceFactory deferServiceFactory;
volatile AnnotationBasedProcessorFactory annotationBasedProcessorFactory;
- volatile ExchangeFactoryManager exchangeFactoryManager;
volatile ReactiveExecutor reactiveExecutor;
volatile Registry registry;
volatile ManagementStrategy managementStrategy;
@@ -3286,7 +3285,6 @@ public abstract class AbstractCamelContext extends BaseService
typeConverterRegistry = null;
typeConverter = null;
reactiveExecutor = null;
- exchangeFactoryManager = null;
registry = null;
}
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
index 49bec33d3d5..c9e023ef6ac 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
@@ -81,6 +81,7 @@ class DefaultCamelContextExtension implements ExtendedCamelContext {
private final PluginManager pluginManager = new DefaultContextPluginManager();
private volatile String description;
private volatile ExchangeFactory exchangeFactory;
+ private volatile ExchangeFactoryManager exchangeFactoryManager;
private volatile ProcessorExchangeFactory processorExchangeFactory;
@Deprecated
private ErrorHandlerFactory errorHandlerFactory;
@@ -434,19 +435,19 @@ class DefaultCamelContextExtension implements ExtendedCamelContext {
@Override
public ExchangeFactoryManager getExchangeFactoryManager() {
- if (camelContext.exchangeFactoryManager == null) {
- synchronized (camelContext.lock) {
- if (camelContext.exchangeFactoryManager == null) {
+ if (exchangeFactoryManager == null) {
+ synchronized (lock) {
+ if (exchangeFactoryManager == null) {
setExchangeFactoryManager(camelContext.createExchangeFactoryManager());
}
}
}
- return camelContext.exchangeFactoryManager;
+ return exchangeFactoryManager;
}
@Override
public void setExchangeFactoryManager(ExchangeFactoryManager exchangeFactoryManager) {
- camelContext.exchangeFactoryManager = camelContext.getInternalServiceManager().addService(exchangeFactoryManager);
+ this.exchangeFactoryManager = camelContext.getInternalServiceManager().addService(exchangeFactoryManager);
}
@Override
[camel] 02/03: CAMEL-15105: move ProcessorExchangeFactory ownership to the context extension
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit eedaeb8b4bcea85e91d0d6af050b6949cf2b2c26
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 3 14:53:17 2023 +0200
CAMEL-15105: move ProcessorExchangeFactory ownership to the context extension
---
.../org/apache/camel/impl/engine/AbstractCamelContext.java | 2 --
.../camel/impl/engine/DefaultCamelContextExtension.java | 11 ++++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index d3c4ff7523e..b343ddd8161 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -207,7 +207,6 @@ public abstract class AbstractCamelContext extends BaseService
volatile DeferServiceFactory deferServiceFactory;
volatile AnnotationBasedProcessorFactory annotationBasedProcessorFactory;
volatile ExchangeFactoryManager exchangeFactoryManager;
- volatile ProcessorExchangeFactory processorExchangeFactory;
volatile ReactiveExecutor reactiveExecutor;
volatile Registry registry;
volatile ManagementStrategy managementStrategy;
@@ -3288,7 +3287,6 @@ public abstract class AbstractCamelContext extends BaseService
typeConverter = null;
reactiveExecutor = null;
exchangeFactoryManager = null;
- processorExchangeFactory = null;
registry = null;
}
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
index 8212b1e7f94..49bec33d3d5 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
@@ -81,6 +81,7 @@ class DefaultCamelContextExtension implements ExtendedCamelContext {
private final PluginManager pluginManager = new DefaultContextPluginManager();
private volatile String description;
private volatile ExchangeFactory exchangeFactory;
+ private volatile ProcessorExchangeFactory processorExchangeFactory;
@Deprecated
private ErrorHandlerFactory errorHandlerFactory;
private String basePackageScan;
@@ -450,21 +451,21 @@ class DefaultCamelContextExtension implements ExtendedCamelContext {
@Override
public ProcessorExchangeFactory getProcessorExchangeFactory() {
- if (camelContext.processorExchangeFactory == null) {
- synchronized (camelContext.lock) {
- if (camelContext.processorExchangeFactory == null) {
+ if (processorExchangeFactory == null) {
+ synchronized (lock) {
+ if (processorExchangeFactory == null) {
setProcessorExchangeFactory(camelContext.createProcessorExchangeFactory());
}
}
}
- return camelContext.processorExchangeFactory;
+ return processorExchangeFactory;
}
@Override
public void setProcessorExchangeFactory(ProcessorExchangeFactory processorExchangeFactory) {
// automatic inject camel context
processorExchangeFactory.setCamelContext(camelContext);
- camelContext.processorExchangeFactory = processorExchangeFactory;
+ this.processorExchangeFactory = processorExchangeFactory;
}
@Override