You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by jb...@apache.org on 2013/11/19 18:21:34 UTC
[1/2] git commit: [CAMEL-6983] Be sure to get the PaxLoggingEvent
properties from the local thread
Updated Branches:
refs/heads/master 4f06ebaec -> c1616bcfa
[CAMEL-6983] Be sure to get the PaxLoggingEvent properties from the local thread
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/33f1fca0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/33f1fca0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/33f1fca0
Branch: refs/heads/master
Commit: 33f1fca0ce3895f6f21226c1e52fdb78a533acd7
Parents: 8fe106b
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Nov 19 18:17:34 2013 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Nov 19 18:17:34 2013 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/paxlogging/PaxLoggingConsumer.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/33f1fca0/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
index 7e9b44d..51eb2dc 100644
--- a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
+++ b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
@@ -53,6 +53,8 @@ public class PaxLoggingConsumer extends DefaultConsumer implements PaxAppender {
}
public void doAppend(final PaxLoggingEvent paxLoggingEvent) {
+ // in order to "force" the copy of properties (especially the MDC ones) in the local thread
+ paxLoggingEvent.getProperties();
executor.execute(new Runnable() {
public void run() {
sendExchange(paxLoggingEvent);
[2/2] git commit: [CAMEL-6983] Merge
Posted by jb...@apache.org.
[CAMEL-6983] Merge
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c1616bcf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c1616bcf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c1616bcf
Branch: refs/heads/master
Commit: c1616bcfaebe7b975221d29fedbf6f02f3797e70
Parents: 33f1fca 4f06eba
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Nov 19 18:20:43 2013 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Nov 19 18:20:43 2013 +0100
----------------------------------------------------------------------
.../cxf/common/header/CxfHeaderHelper.java | 7 ++--
.../cxf/common/header/CxfHeaderHelperTest.java | 36 ++++++++++++++++++--
2 files changed, 38 insertions(+), 5 deletions(-)
----------------------------------------------------------------------