Skip to content

Commit 28c6f04

Browse files
committed
Fixes #234. Broken log4j 2.x integration with rc2.
1 parent 6f03a3c commit 28c6f04

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
<dependency>
177177
<groupId>org.apache.logging.log4j</groupId>
178178
<artifactId>log4j-core</artifactId>
179-
<version>2.0-rc1</version>
179+
<version>2.0-rc2</version>
180180
<optional>true</optional>
181181
</dependency>
182182
<dependency>

src/main/java/org/apache/ibatis/logging/log4j2/Log4j2AbstractLoggerImpl.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@
2222
import org.apache.logging.log4j.MarkerManager;
2323
import org.apache.logging.log4j.message.SimpleMessage;
2424
import org.apache.logging.log4j.spi.AbstractLogger;
25-
import org.apache.logging.log4j.spi.AbstractLoggerWrapper;
25+
import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;
2626

2727
/**
2828
* @author Eduardo Macarron
2929
*/
3030
public class Log4j2AbstractLoggerImpl implements Log {
31-
31+
3232
private static Marker MARKER = MarkerManager.getMarker(LogFactory.MARKER);
33-
33+
3434
private static final String FQCN = Log4j2Impl.class.getName();
35-
36-
private AbstractLoggerWrapper log;
35+
36+
private ExtendedLoggerWrapper log;
3737

3838
public Log4j2AbstractLoggerImpl(AbstractLogger abstractLogger) {
39-
log = new AbstractLoggerWrapper(abstractLogger, abstractLogger.getName(), abstractLogger.getMessageFactory());
39+
log = new ExtendedLoggerWrapper(abstractLogger, abstractLogger.getName(), abstractLogger.getMessageFactory());
4040
}
4141

4242
public boolean isDebugEnabled() {
@@ -48,23 +48,23 @@ public boolean isTraceEnabled() {
4848
}
4949

5050
public void error(String s, Throwable e) {
51-
log.log(MARKER, FQCN, Level.ERROR, new SimpleMessage(s), e);
51+
log.logIfEnabled(FQCN, Level.ERROR, MARKER, new SimpleMessage(s), e);
5252
}
5353

5454
public void error(String s) {
55-
log.log(MARKER, FQCN, Level.ERROR, new SimpleMessage(s), null);
55+
log.logIfEnabled(FQCN, Level.ERROR, MARKER, new SimpleMessage(s), null);
5656
}
5757

5858
public void debug(String s) {
59-
log.log(MARKER, FQCN, Level.DEBUG, new SimpleMessage(s), null);
59+
log.logIfEnabled(FQCN, Level.DEBUG, MARKER, new SimpleMessage(s), null);
6060
}
6161

6262
public void trace(String s) {
63-
log.log(MARKER, FQCN, Level.TRACE, new SimpleMessage(s), null);
63+
log.logIfEnabled(FQCN, Level.TRACE, MARKER, new SimpleMessage(s), null);
6464
}
6565

6666
public void warn(String s) {
67-
log.log(MARKER, FQCN, Level.WARN, new SimpleMessage(s), null);
67+
log.logIfEnabled(FQCN, Level.WARN, MARKER, new SimpleMessage(s), null);
6868
}
6969

7070
}

0 commit comments

Comments
 (0)