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 aca13af8cfb72b02a989b1f0ce5dc91ea57fe682
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Jan 21 06:51:27 2020 +0100

    CAMEL-14354: Optimize core
---
 .../main/java/org/apache/camel/processor/CamelInternalProcessor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
 
b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 46cc50e..8da55df 100644
--- 
a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++ 
b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -231,7 +231,7 @@ public class CamelInternalProcessor extends 
DelegateAsyncProcessor {
             // do uow before processing and if a value is returned the the uow 
wants to be processed after
             // was well in the same thread
             AsyncCallback async = callback;
-            boolean beforeAndAfter = uow.isBeforeAfterProcess();
+            boolean beforeAndAfter = uow != null && uow.isBeforeAfterProcess();
             if (beforeAndAfter) {
                 async = uow.beforeProcess(processor, exchange, async);
             }

Reply via email to