From 9a3afac24325778dc1f4c88cf329f92c83479b35 Mon Sep 17 00:00:00 2001
From: harveyyue <yw_yuewei@126.com>
Date: Wed, 1 Jun 2022 11:17:27 +0800
Subject: [PATCH] DBZ-5180 Put the MysqlPartition values to MDC getting NPE in
 logging context phase

---
 .../src/main/java/io/debezium/util/LoggingContext.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/debezium-core/src/main/java/io/debezium/util/LoggingContext.java b/debezium-core/src/main/java/io/debezium/util/LoggingContext.java
index aa6534224..da5bf2034 100644
--- a/debezium-core/src/main/java/io/debezium/util/LoggingContext.java
+++ b/debezium-core/src/main/java/io/debezium/util/LoggingContext.java
@@ -99,8 +99,12 @@ public static PreviousContext forConnector(String connectorType, String connecto
         if (taskId != null) {
             MDC.put(TASK_ID, taskId);
         }
-        if (partition != null) {
-            partition.getLoggingContext().forEach(MDC::put);
+        if (partition != null && partition.getLoggingContext() != null) {
+            partition.getLoggingContext().forEach((k, v) -> {
+                if (k != null && v != null) {
+                    MDC.put(k, v);
+                }
+            });
         }
         MDC.put(CONNECTOR_TYPE, connectorType);
         MDC.put(CONNECTOR_NAME, connectorName);