Skip to content

Commit 505eb07

Browse files
update null check
1 parent 4916d9a commit 505eb07

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

logback13/src/main/java/com/newrelic/logging/logback13/NewRelicAsyncAppender.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ protected void append(ILoggingEvent eventObject) {
6262
Map<String, String> copyMdc = MDC.getMDCAdapter().getCopyOfContextMap();
6363
if (copyMdc != null) {
6464
for (Map.Entry<String, String> entry : copyMdc.entrySet()) {
65-
combinedContextMap.put(CONTEXT_PREFIX + entry.getKey(), entry.getValue());
65+
if (entry.getValue() != null) {
66+
combinedContextMap.put(CONTEXT_PREFIX + entry.getKey(), entry.getValue());
67+
}
6668
}
6769
}
6870

logback13/src/main/java/com/newrelic/logging/logback13/NewRelicJsonLayout.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ private void writeToGenerator(ILoggingEvent eventObject, JsonGenerator generator
7474
String value;
7575

7676
for (Map.Entry<String, String> entry : mdcPropertyMap.entrySet()) {
77+
if (entry.getValue() == null) {
78+
continue;
79+
}
7780
key = entry.getKey();
7881
value = entry.getValue();
7982
generator.writeStringField(key, value);

0 commit comments

Comments
 (0)