You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2019/01/08 07:27:10 UTC
[camel] branch master updated: Fix for CAMEL-13033
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new f235203 Fix for CAMEL-13033
new 0fa355c Merge branch 'CAMEL-13033'
f235203 is described below
commit f23520327e887028d3334206f89a7566261d0c83
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jan 7 18:03:00 2019 +0100
Fix for CAMEL-13033
---
camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java | 2 ++
.../main/java/org/apache/camel/processor/CamelInternalProcessor.java | 2 +-
.../src/main/java/org/apache/camel/processor/MulticastProcessor.java | 2 +-
.../java/org/apache/camel/processor/SharedCamelInternalProcessor.java | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java b/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
index a347d50..45ee25b 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
@@ -132,12 +132,14 @@ public class MDCUnitOfWork extends DefaultUnitOfWork {
@Override
public void afterProcess(Processor processor, Exchange exchange, AsyncCallback callback, boolean doneSync) {
+ /*
if (!doneSync) {
// must clear MDC on current thread as the exchange is being processed asynchronously
// by another thread
clear();
}
super.afterProcess(processor, exchange, callback, doneSync);
+ */
}
/**
diff --git a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index ce03628..f485440 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -222,7 +222,7 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor {
// CAMEL END USER - DEBUG ME HERE +++ END +++
// ----------------------------------------------------------
- ReactiveHelper.scheduleLast(() -> {
+ ReactiveHelper.schedule(() -> {
// execute any after processor work (in current thread, not in the callback)
if (uow != null) {
uow.afterProcess(processor, exchange, callback, false);
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 ccb6e23..5a2e9b6 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
@@ -240,7 +240,7 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat
if (isParallelProcessing()) {
executorService.submit(() -> ReactiveHelper.schedule(runnable));
} else {
- ReactiveHelper.scheduleLast(runnable, "Multicast next step");
+ ReactiveHelper.schedule(runnable, "Multicast next step");
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java
index 4f004ef..ab9c3da 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java
@@ -191,7 +191,7 @@ public class SharedCamelInternalProcessor {
// CAMEL END USER - DEBUG ME HERE +++ END +++
// ----------------------------------------------------------
- ReactiveHelper.scheduleLast(() -> {
+ ReactiveHelper.schedule(() -> {
// execute any after processor work (in current thread, not in the callback)
if (uow != null) {
uow.afterProcess(processor, exchange, callback, sync);