Added null safety

Hakky54 · Nov 17, 2024 · bfc189f · bfc189f
1 parent 1ba7595
commit bfc189f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/nl/altindag/log/mapper/LogEventMapper.java b/src/main/java/nl/altindag/log/mapper/LogEventMapper.java
@@ -52,7 +52,7 @@ public LogEvent apply(ILoggingEvent iLoggingEvent) {
         String threadName = iLoggingEvent.getThreadName();
         ZonedDateTime timeStamp = ZonedDateTime.ofInstant(Instant.ofEpochMilli(iLoggingEvent.getTimeStamp()), ZoneOffset.UTC);
         Map<String, String> diagnosticContext = Collections.unmodifiableMap(iLoggingEvent.getMDCPropertyMap());
-        List<Map.Entry<String, Object>> keyValuePairs = iLoggingEvent.getKeyValuePairs().stream()
+        List<Map.Entry<String, Object>> keyValuePairs = iLoggingEvent.getKeyValuePairs() == null ? Collections.emptyList() : iLoggingEvent.getKeyValuePairs().stream()
                 .map(keyValuePair -> new AbstractMap.SimpleImmutableEntry<>(keyValuePair.key, keyValuePair.value))
                 .collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList));