From 95cd835443a908deaeee21f74ef7b6c8d7239395 Mon Sep 17 00:00:00 2001 From: Joern Huxhorn Date: Wed, 16 Nov 2016 13:42:46 +0100 Subject: [PATCH] Using Throwable of Message if not explicitly given --- .../src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java index 0741ab5..7504787 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java @@ -1974,13 +1974,13 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable { protected void logMessage(final String fqcn, final Level level, final Marker marker, final MessageSupplier msgSupplier, final Throwable t) { final Message message = LambdaUtil.get(msgSupplier); - logMessageSafely(fqcn, level, marker, message, t); + logMessageSafely(fqcn, level, marker, message, (t == null && message != null) ? message.getThrowable() : t); } protected void logMessage(final String fqcn, final Level level, final Marker marker, final Supplier msgSupplier, final Throwable t) { final Message message = LambdaUtil.getMessage(msgSupplier, messageFactory); - logMessageSafely(fqcn, level, marker, message, t); + logMessageSafely(fqcn, level, marker, message, (t == null && message != null) ? message.getThrowable() : t); } protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message, -- 2.10.2