You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@uima.apache.org by sc...@apache.org on 2017/09/14 13:34:50 UTC

svn commit: r1808342 - /uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java

Author: schor
Date: Thu Sep 14 13:34:50 2017
New Revision: 1808342

URL: http://svn.apache.org/viewvc?rev=1808342&view=rev
Log:
[UIMA-5571] fix log4j bridge for throwables and non-throwable calls

Modified:
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java?rev=1808342&r1=1808341&r2=1808342&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java Thu Sep 14 13:34:50 2017
@@ -308,7 +308,12 @@ public class Log4jLogger_impl extends Lo
    }  
 
    public void log2(Marker m, String aFqcn, Level level, String message, Object[] args, Throwable thrown) {
-     logger.logIfEnabled(aFqcn, getLog4jLevel(level), m(m), message, args, thrown);
+     if (thrown != null) {
+       assert args == null;
+       logger.logIfEnabled(aFqcn, getLog4jLevel(level), m(m), message, thrown);
+     } else {
+       logger.logIfEnabled(aFqcn, getLog4jLevel(level), m(m), message, args);
+     }
    }