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/04/16 10:35:36 UTC
[camel] branch master updated (4218b92 -> da4bda0)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4218b92 Fixed simple language doc TIP section
new 11f08e9 CAMEL-12447: camel-jms - Exclude spring-messaging JAR
new da4bda0 CAMEL-12446: Splitter - Make it easier to turn off propgate exception
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:
.../camel/processor/aggregate/UseOriginalAggregationStrategy.java | 4 ++++
.../java/org/apache/camel/util/toolbox/AggregationStrategies.java | 2 +-
components/camel-jms/pom.xml | 6 ++++++
3 files changed, 11 insertions(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.
[camel] 01/02: CAMEL-12447: camel-jms - Exclude spring-messaging JAR
Posted by da...@apache.org.
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
commit 11f08e9e14bbafb0aab72f5281ee4654e643272b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Apr 16 12:18:26 2018 +0200
CAMEL-12447: camel-jms - Exclude spring-messaging JAR
---
components/camel-jms/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 13a6238..83e4279 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -50,6 +50,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-messaging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.
[camel] 02/02: CAMEL-12446: Splitter - Make it easier to turn off
propgate exception
Posted by da...@apache.org.
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
commit da4bda004dbca796bca7ebf4f697fbe7ba1fd0fa
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Apr 16 12:19:20 2018 +0200
CAMEL-12446: Splitter - Make it easier to turn off propgate exception
---
.../camel/processor/aggregate/UseOriginalAggregationStrategy.java | 4 ++++
.../java/org/apache/camel/util/toolbox/AggregationStrategies.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseOriginalAggregationStrategy.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseOriginalAggregationStrategy.java
index dbd60c5..5b3ac53 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseOriginalAggregationStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseOriginalAggregationStrategy.java
@@ -35,6 +35,10 @@ public class UseOriginalAggregationStrategy implements AggregationStrategy {
this(null, true);
}
+ public UseOriginalAggregationStrategy(boolean propagateException) {
+ this.propagateException = propagateException;
+ }
+
public UseOriginalAggregationStrategy(Exchange original, boolean propagateException) {
this.original = original;
this.propagateException = propagateException;
diff --git a/camel-core/src/main/java/org/apache/camel/util/toolbox/AggregationStrategies.java b/camel-core/src/main/java/org/apache/camel/util/toolbox/AggregationStrategies.java
index ac68858..4952be1 100644
--- a/camel-core/src/main/java/org/apache/camel/util/toolbox/AggregationStrategies.java
+++ b/camel-core/src/main/java/org/apache/camel/util/toolbox/AggregationStrategies.java
@@ -77,7 +77,7 @@ public final class AggregationStrategies {
* @see org.apache.camel.processor.aggregate.UseOriginalAggregationStrategy
*/
public static AggregationStrategy useOriginal(boolean propagateException) {
- return new UseOriginalAggregationStrategy(null, propagateException);
+ return new UseOriginalAggregationStrategy(propagateException);
}
/**
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.