CAMEL-7785: Fixed potential NPE.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2fc0f1fa Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2fc0f1fa Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2fc0f1fa Branch: refs/heads/camel-2.14.x Commit: 2fc0f1fabd8cd242e36af69e0fe602b172758182 Parents: 2d8148e Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Nov 30 16:49:38 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Nov 30 16:51:07 2014 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/impl/DefaultExchange.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2fc0f1fa/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java index 164ae67..b020184 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java @@ -369,7 +369,7 @@ public final class DefaultExchange implements Exchange { public void setUnitOfWork(UnitOfWork unitOfWork) { this.unitOfWork = unitOfWork; - if (onCompletions != null) { + if (unitOfWork != null && onCompletions != null) { // now an unit of work has been assigned so add the on completions // we might have registered already for (Synchronization onCompletion : onCompletions) {
