Thanks for taking care of this! On Wed, Sep 10, 2014 at 2:57 AM, <ningji...@apache.org> wrote:
> Repository: camel > Updated Branches: > refs/heads/master 734afce69 -> 19b2aa315 > > > 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/19b2aa31 > Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/19b2aa31 > Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/19b2aa31 > > Branch: refs/heads/master > Commit: 19b2aa31514ffcad7ae01de8bb3d0f29bf3966d0 > Parents: 734afce > Author: Willem Jiang <willem.ji...@gmail.com> > Authored: Wed Sep 10 09:56:34 2014 +0800 > Committer: Willem Jiang <willem.ji...@gmail.com> > Committed: Wed Sep 10 09:56:34 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/19b2aa31/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); > >
