You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/04/07 15:33:14 UTC
[camel] branch master updated (2d99a35 -> a49558f)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 2d99a35 CAMEL-14179: Fixed xml dsl and docs
new fe99b7f Camel-Microprofile-fault-tolerance: Fixed CS
new a49558f Remove duplicated property placeholders for djl
The 2 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:
.../component/microprofile/faulttolerance/FaultToleranceReifier.java | 4 ++--
parent/pom.xml | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
[camel] 01/02: Camel-Microprofile-fault-tolerance: Fixed CS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fe99b7ff4319218b7111c207960e7ba4d3327069
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Apr 7 16:27:33 2020 +0200
Camel-Microprofile-fault-tolerance: Fixed CS
---
.../component/microprofile/faulttolerance/FaultToleranceReifier.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java b/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java
index dfd7654..ec81375 100644
--- a/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java
+++ b/components/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java
@@ -92,7 +92,7 @@ public class FaultToleranceReifier extends ProcessorReifier<CircuitBreakerDefini
target.setTimeoutEnabled(true);
}
- target.setTimeoutDuration(parseLong(config.getTimeoutDuration(),1000));
+ target.setTimeoutDuration(parseLong(config.getTimeoutDuration(), 1000));
target.setTimeoutPoolSize(parseInt(config.getTimeoutPoolSize(), 10));
}
@@ -133,7 +133,7 @@ public class FaultToleranceReifier extends ProcessorReifier<CircuitBreakerDefini
// Extract properties from default configuration, the one configured on
// camel context takes the precedence over those in the registry
loadProperties(properties, Suppliers.firstNotNull(
- () -> camelContext.getExtension(Model.class).getFaultToleranceConfiguration(null),
+ () -> camelContext.getExtension(Model.class).getFaultToleranceConfiguration(null),
() -> lookup(FaultToleranceConstants.DEFAULT_FAULT_TOLERANCE_CONFIGURATION_ID, FaultToleranceConfigurationDefinition.class)));
// Extract properties from referenced configuration, the one configured
[camel] 02/02: Remove duplicated property placeholders for djl
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a49558fc817c7dea98d0ac2d832ce25d905002e2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Apr 7 17:09:20 2020 +0200
Remove duplicated property placeholders for djl
---
parent/pom.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 635944d..718b1e8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -142,8 +142,6 @@
<digitalocean-api-client-version>2.17</digitalocean-api-client-version>
<directory-watcher-version>0.9.9</directory-watcher-version>
<disruptor-version>3.4.2</disruptor-version>
- <djl-version>0.4.0</djl-version>
- <djl-mxnet-native-version>1.6.0</djl-mxnet-native-version>
<dnsjava-version>3.0.1</dnsjava-version>
<djl-version>0.4.0</djl-version>
<djl-mxnet-native-version>1.6.0</djl-mxnet-native-version>