This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new b90e352 CAMEL-14568: Fixed camel-infinispan to work better with
spring boot autoconfiguration
b90e352 is described below
commit b90e35229cc242a1cf3ad8f4396028640b226852
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Feb 28 12:29:16 2020 +0100
CAMEL-14568: Fixed camel-infinispan to work better with spring boot
autoconfiguration
---
.../apache/camel/component/infinispan/InfinispanComponent.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanComponent.java
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanComponent.java
index 3e111e1..d9a9a7f 100644
---
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanComponent.java
+++
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanComponent.java
@@ -38,7 +38,7 @@ public class InfinispanComponent extends DefaultComponent {
private transient CacheContainer defaultCacheManager;
@Metadata(description = "Component configuration")
- private InfinispanConfiguration configuration;
+ private InfinispanConfiguration configuration = new
InfinispanConfiguration();
public InfinispanComponent() {
}
@@ -49,12 +49,7 @@ public class InfinispanComponent extends DefaultComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
- InfinispanConfiguration conf;
- if (configuration != null) {
- conf = configuration.copy();
- } else {
- conf = new InfinispanConfiguration();
- }
+ InfinispanConfiguration conf = configuration.copy();
// init default embedded cache if config parameters aren't specified
or cacheContainer is set using setMethod
if (!isConfigProvided(parameters, conf)) {
if (defaultCacheManager == null) {
