From 75670e35095813603e7bc6127a4a7640dc710403 Mon Sep 17 00:00:00 2001
From: Joern Huxhorn <jhuxhorn@googlemail.com>
Date: Wed, 16 Nov 2016 13:22:40 +0100
Subject: [PATCH] Using Throwable of Message if available.

---
 .../apache/logging/log4j/spi/AbstractLogger.java   | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 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 84ce567..0741ab5 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
@@ -243,7 +243,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     @Override
     public void debug(final Marker marker, final Message msg) {
-        logIfEnabled(FQCN, Level.DEBUG, marker, msg, null);
+        logIfEnabled(FQCN, Level.DEBUG, marker, msg, msg != null ? msg.getThrowable() : null);
     }
 
     @Override
@@ -278,7 +278,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     @Override
     public void debug(final Message msg) {
-        logIfEnabled(FQCN, Level.DEBUG, null, msg, null);
+        logIfEnabled(FQCN, Level.DEBUG, null, msg, msg != null ? msg.getThrowable() : null);
     }
 
     @Override
@@ -645,7 +645,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     @Override
     public void error(final Marker marker, final Message msg) {
-        logIfEnabled(FQCN, Level.ERROR, marker, msg, null);
+        logIfEnabled(FQCN, Level.ERROR, marker, msg, msg != null ? msg.getThrowable() : null);
     }
 
     @Override
@@ -690,7 +690,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     @Override
     public void error(final Message msg) {
-        logIfEnabled(FQCN, Level.ERROR, null, msg, null);
+        logIfEnabled(FQCN, Level.ERROR, null, msg, msg != null ? msg.getThrowable() : null);
     }
 
     @Override
@@ -952,7 +952,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     @Override
     public void fatal(final Marker marker, final Message msg) {
-        logIfEnabled(FQCN, Level.FATAL, marker, msg, null);
+        logIfEnabled(FQCN, Level.FATAL, marker, msg, msg != null ? msg.getThrowable() : null);
     }
 
     @Override
@@ -997,7 +997,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     @Override
     public void fatal(final Message msg) {
-        logIfEnabled(FQCN, Level.FATAL, null, msg, null);
+        logIfEnabled(FQCN, Level.FATAL, null, msg, msg != null ? msg.getThrowable() : null);
     }
 
     @Override
@@ -1219,7 +1219,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     @Override
     public void info(final Marker marker, final Message msg) {
-        logIfEnabled(FQCN, Level.INFO, marker, msg, null);
+        logIfEnabled(FQCN, Level.INFO, marker, msg, msg != null ? msg.getThrowable() : null);
     }
 
     @Override
@@ -1264,7 +1264,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     @Override
     public void info(final Message msg) {
-        logIfEnabled(FQCN, Level.INFO, null, msg, null);
+        logIfEnabled(FQCN, Level.INFO, null, msg, msg != null ? msg.getThrowable() : null);
     }
 
     @Override
@@ -1547,7 +1547,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     @Override
     public void log(final Level level, final Marker marker, final Message msg) {
-        logIfEnabled(FQCN, level, marker, msg, (Throwable) null);
+        logIfEnabled(FQCN, level, marker, msg, msg != null ? msg.getThrowable() : null);
     }
 
     @Override
@@ -1596,7 +1596,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     @Override
     public void log(final Level level, final Message msg) {
-        logIfEnabled(FQCN, level, null, msg, null);
+        logIfEnabled(FQCN, level, null, msg, msg != null ? msg.getThrowable() : null);
     }
 
     @Override
@@ -2127,7 +2127,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     @Override
     public void trace(final Marker marker, final Message msg) {
-        logIfEnabled(FQCN, Level.TRACE, marker, msg, null);
+        logIfEnabled(FQCN, Level.TRACE, marker, msg, msg != null ? msg.getThrowable() : null);
     }
 
     @Override
@@ -2172,7 +2172,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     @Override
     public void trace(final Message msg) {
-        logIfEnabled(FQCN, Level.TRACE, null, msg, null);
+        logIfEnabled(FQCN, Level.TRACE, null, msg, msg != null ? msg.getThrowable() : null);
     }
 
     @Override
@@ -2448,7 +2448,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     @Override
     public void warn(final Marker marker, final Message msg) {
-        logIfEnabled(FQCN, Level.WARN, marker, msg, null);
+        logIfEnabled(FQCN, Level.WARN, marker, msg, msg != null ? msg.getThrowable() : null);
     }
 
     @Override
@@ -2493,7 +2493,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     @Override
     public void warn(final Message msg) {
-        logIfEnabled(FQCN, Level.WARN, null, msg, null);
+        logIfEnabled(FQCN, Level.WARN, null, msg, msg != null ? msg.getThrowable() : null);
     }
 
     @Override
-- 
2.10.2