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 2016/12/01 20:03:10 UTC
[1/2] camel git commit: CAMEL-10272: Completed the aggregation
strategy javadoc
Repository: camel
Updated Branches:
refs/heads/master 5fa4f3eb5 -> 68e1a5431
CAMEL-10272: Completed the aggregation strategy javadoc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/68e1a543
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/68e1a543
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/68e1a543
Branch: refs/heads/master
Commit: 68e1a5431e93175514b21ae39d7f43bf4553073b
Parents: 62d19db
Author: aldettinger <al...@gmail.com>
Authored: Thu Dec 1 16:57:06 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Dec 1 21:01:46 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/processor/aggregate/AggregationStrategy.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/68e1a543/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategy.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategy.java
index e8cd90f..802e1b8 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategy.java
@@ -28,6 +28,9 @@ import org.apache.camel.Exchange;
* or remove some headers. And a more common use case is for instance to count some values from the body payload. That
* could be to sum up a total amount etc.
* <p/>
+ * Note that <tt>oldExchange</tt> may be <tt>null</tt> more than once when this strategy is throwing a {@link java.lang.RuntimeException}
+ * and <tt>parallelProcessing</tt> is used.
+ * <p/>
* It is possible that <tt>newExchange</tt> is <tt>null</tt> which could happen if there was no data possible
* to acquire. Such as when using a {@link org.apache.camel.processor.PollEnricher} to poll from a JMS queue which
* is empty and a timeout was set.
[2/2] camel git commit: CAMEL-10272: Added a debug log covering for
instance a runtime exception thrown from a custom aggregation strategy
Posted by da...@apache.org.
CAMEL-10272: Added a debug log covering for instance a runtime exception thrown from a custom aggregation strategy
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/62d19db0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/62d19db0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/62d19db0
Branch: refs/heads/master
Commit: 62d19db070a1b2c6a83f3ccd942b72f90c3cba37
Parents: 5fa4f3e
Author: aldettinger <al...@gmail.com>
Authored: Thu Dec 1 16:48:48 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Dec 1 21:01:46 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/processor/MulticastProcessor.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/62d19db0/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index 5c5b361..e0cd13d 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -531,7 +531,9 @@ public class MulticastProcessor extends ServiceSupport implements AsyncProcessor
}
} catch (Throwable e) {
// wrap in exception to explain where it failed
- subExchange.setException(new CamelExchangeException("Parallel processing failed for number " + aggregated.get(), subExchange, e));
+ CamelExchangeException cex = new CamelExchangeException("Parallel processing failed for number " + aggregated.get(), subExchange, e);
+ subExchange.setException(cex);
+ LOG.debug(cex.getMessage(), cex);
} finally {
aggregated.incrementAndGet();
}