fixed SLF4J-233

qos-ch · Feb 19, 2019 · a822fd7 · a822fd7
1 parent fc7bf4d
commit a822fd7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java
@@ -194,19 +194,19 @@ void differentiatedLog(Marker marker, String fqcn, int level, Object message, Th
         } else {
             switch (level) {
             case LocationAwareLogger.TRACE_INT:
-                slf4jLogger.trace(marker, m);
+                slf4jLogger.trace(marker, m, (Throwable) t);
                 break;
             case LocationAwareLogger.DEBUG_INT:
-                slf4jLogger.debug(marker, m);
+                slf4jLogger.debug(marker, m, (Throwable) t);
                 break;
             case LocationAwareLogger.INFO_INT:
-                slf4jLogger.info(marker, m);
+                slf4jLogger.info(marker, m, (Throwable) t);
                 break;
             case LocationAwareLogger.WARN_INT:
-                slf4jLogger.warn(marker, m);
+                slf4jLogger.warn(marker, m, (Throwable) t);
                 break;
             case LocationAwareLogger.ERROR_INT:
-                slf4jLogger.error(marker, m);
+                slf4jLogger.error(marker, m, (Throwable) t);
                 break;
             }
         }

diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java
@@ -78,7 +78,7 @@ public void trace(Object message) {
      * method in SLF4J.
      */
     public void trace(Object message, Throwable t) {
-        differentiatedLog(null, LOGGER_FQCN, LocationAwareLogger.TRACE_INT, message, null);
+        differentiatedLog(null, LOGGER_FQCN, LocationAwareLogger.TRACE_INT, message, t);
     }
 
 }
diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html
@@ -38,13 +38,17 @@ <h1>SLF4J News</h1>
    -->
 
 
-   <!--
+
 
    <hr noshade="noshade" size="1"/>
 
    <h3>2019 - Release of SLF4J 1.8.0-beta5</h3>
 
--->
+   <p>Fixed ignored Throwable issue in log4j-over-slf4j as reported in
+   <a href="https://jira.qos.ch/browse/SLF4J-233">SLF4J-233</a> by
+   John Vasileff.</p>
+
+
    <hr noshade="noshade" size="1"/>
 
    <h3>February 19th, 2019 - Release of SLF4J 1.8.0-beta4</h3>