Repository: camel Updated Branches: refs/heads/master b80021a15 -> 4a01d60cc
CAMEL-8213: Fixed potential NPE in agg strategy. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4a01d60c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4a01d60c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4a01d60c Branch: refs/heads/master Commit: 4a01d60cc156fd008037b30ca2911404e797f102 Parents: b80021a Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Jan 8 21:18:25 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Jan 9 07:27:58 2015 +0100 ---------------------------------------------------------------------- .../processor/aggregate/UseOriginalAggregationStrategy.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4a01d60c/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseOriginalAggregationStrategy.java ---------------------------------------------------------------------- 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 d6b7059..764151f 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 @@ -44,7 +44,11 @@ public class UseOriginalAggregationStrategy implements AggregationStrategy { if (propagateException) { Exception exception = checkException(oldExchange, newExchange); if (exception != null) { - original.setException(exception); + if (original != null) { + original.setException(exception); + } else { + oldExchange.setException(exception); + } } } return original != null ? original : oldExchange;
