You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2014/10/17 10:39:56 UTC
[03/50] git commit: CAMEL-7795 Fixed the regression of MDCResetTest
CAMEL-7795 Fixed the regression of MDCResetTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/59e467d8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/59e467d8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/59e467d8
Branch: refs/remotes/origin/camel-2.13.x
Commit: 59e467d816ef86181020455c97da42c15249d2ec
Parents: 5a05109
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Sep 10 09:56:34 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Sep 10 09:59:16 2014 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/impl/MDCUnitOfWork.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/59e467d8/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
----------------------------------------------------------------------
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 62f6b16..1726b80 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
@@ -217,13 +217,15 @@ public class MDCUnitOfWork extends DefaultUnitOfWork {
if (correlationId != null) {
MDC.put(MDC_CORRELATION_ID, correlationId);
}
- if (routeId != null) {
- MDC.put(MDC_ROUTE_ID, routeId);
- }
if (camelContextId != null) {
MDC.put(MDC_CAMEL_CONTEXT_ID, camelContextId);
}
}
+ // need to setup the routeId finally
+ if (routeId != null) {
+ MDC.put(MDC_ROUTE_ID, routeId);
+ }
+
} finally {
// muse ensure delegate is invoked
delegate.done(doneSync);