[camel] branch camel-3.14.x updated: CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW.

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-3.14.x by this push:
     new 9134d00  CAMEL-17514: Fix MDC logging to ensure data is setup before 
processing. Error handler calling processors must do so in UoW.
9134d00 is described below

commit 9134d00742c8d64b5f321466e64267e6c006469f
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Jan 22 19:07:56 2022 +0100

    CAMEL-17514: Fix MDC logging to ensure data is setup before processing. 
Error handler calling processors must do so in UoW.
---
 .../test/java/org/apache/camel/processor/MDCErrorHandlerTest.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java
index bea130e..ded7bac 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/MDCErrorHandlerTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.processor;
 
+import java.util.Map;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -42,7 +44,7 @@ public class MDCErrorHandlerTest extends ContextTestSupport {
                 
errorHandler(deadLetterChannel("direct:dead").onExceptionOccurred(new 
Processor() {
                     @Override
                     public void process(Exchange exchange) throws Exception {
-                        var m = MDC.getCopyOfContextMap();
+                        Map<String, String> m = MDC.getCopyOfContextMap();
                         Assertions.assertEquals(5, m.size());
                         
Assertions.assertEquals(exchange.getMessage().getHeader(Exchange.BREADCRUMB_ID),
                                 m.get("camel.breadcrumbId"));
@@ -58,7 +60,7 @@ public class MDCErrorHandlerTest extends ContextTestSupport {
                         .process(new Processor() {
                             @Override
                             public void process(Exchange exchange) throws 
Exception {
-                                var m = MDC.getCopyOfContextMap();
+                                Map<String, String> m = 
MDC.getCopyOfContextMap();
                                 Assertions.assertEquals(5, m.size());
                                 
Assertions.assertEquals(exchange.getMessage().getHeader(Exchange.BREADCRUMB_ID),
                                         m.get("camel.breadcrumbId"));