camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/6] camel git commit: CAMEL-7785: Fixed potential NPE.
Date Sun, 30 Nov 2014 16:53:39 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.13.x 8a67c0297 -> 9df6d8f45
  refs/heads/camel-2.14.x 2d8148efb -> 2fc0f1fab
  refs/heads/master 1ad23d044 -> 6674e4ef4


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/c5296e48
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c5296e48
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c5296e48

Branch: refs/heads/master
Commit: c5296e487884418de8dde15e832ea72b027e073f
Parents: 1ad23d0
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sun Nov 30 16:49:38 2014 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Nov 30 16:49:38 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/c5296e48/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 340537b..3045838 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
@@ -394,7 +394,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) {


Mime
View raw message