JENA-1565: Merge commit 'refs/pull/439/head' of https://github.com/ap…

…ache/jena This closes apache#439.
charischen · Jun 25, 2018 · 3d9b167 · 3d9b167
2 parents 6788cbf + 842b4a7
commit 3d9b167
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/java/TextFormatter.java b/jena-base/src/main/java/org/apache/jena/atlas/logging/java/TextFormatter.java
@@ -18,7 +18,9 @@
 
 package org.apache.jena.atlas.logging.java;
 
-import java.text.MessageFormat ;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.MessageFormat;
 import java.util.Date ;
 import java.util.logging.Formatter ;
 import java.util.logging.Level ;
@@ -89,6 +91,18 @@ public String format(LogRecord record) {
         if ( record.getParameters() != null )
             formatted$ = MessageFormat.format(formatted$, record.getParameters()) ;
 
+        String throwable = "";
+        Throwable th = record.getThrown();
+        if ( th != null ) {
+            // Avoid going via bytes because of the risk of platform character set issues.
+            StringWriter sw = new StringWriter();
+            try ( PrintWriter pw = new PrintWriter(sw) ) {
+                pw.println();
+                th.printStackTrace(pw);
+            }
+            formatted$ = formatted$ + sw.toString();
+        }
+
         Level level = record.getLevel() ;
         String levelOutputName = levelOutputName(level) ;
 
@@ -98,7 +112,7 @@ public String format(LogRecord record) {
                              levelOutputName,                   // 3
                              Thread.currentThread().getName(),  // 4
                              new Date(record.getMillis()),      // 5
-                             formatted$) ;                      // 6
+                             formatted$);                       // 6
     }
 
     /** By default use slf4j name.