Author: ceki Date: Wed Jan 23 13:18:38 2008 New Revision: 1606 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java Log: - fixing silly but nonetheless serious copy-and-paste bugs, as reported by by Joern Huxhorn in bug #104 http://bugzilla.qos.ch/show_bug.cgi?id=104 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java Wed Jan 23 13:18:38 2008 @@ -254,7 +254,7 @@ * Invoke all the appenders of this logger. * * @param event - * The event to log + * The event to log */ public void callAppenders(LoggingEvent event) { int writes = 0; @@ -304,9 +304,9 @@ * logger. * * @param lastPart - * the suffix (i.e. last part) of the child logger name. This - * parameter may not include dots, i.e. the logger separator - * character. + * the suffix (i.e. last part) of the child logger + * name. This parameter may not include dots, i.e. the + * logger separator character. * @return */ Logger createChildByLastNamePart(final String lastPart) { @@ -387,9 +387,7 @@ } public void trace(String msg, Throwable t) { - if (isDebugEnabled()) { - filterAndLog(FQCN, null, Level.TRACE, msg, null, t); - } + filterAndLog(FQCN, null, Level.TRACE, msg, null, t); } public final void trace(Marker marker, String msg) { @@ -432,7 +430,7 @@ final Level level, final String msg, final Object param, final Throwable t) { final FilterReply decision = loggerContext.getTurboFilterChainDecision( - marker, this, Level.DEBUG, msg, param, t); + marker, this, level, msg, param, t); if (decision == FilterReply.NEUTRAL) { if (effectiveLevelInt > level.levelInt) { @@ -451,7 +449,7 @@ final Object param2, final Throwable t) { final FilterReply decision = loggerContext.getTurboFilterChainDecision( - marker, this, Level.DEBUG, msg, param1, param2, t); + marker, this, level, msg, param1, param2, t); if (decision == FilterReply.NEUTRAL) { if (effectiveLevelInt > level.levelInt) { @@ -470,7 +468,7 @@ final Throwable t) { final FilterReply decision = loggerContext.getTurboFilterChainDecision( - marker, this, Level.DEBUG, msg, params, t); + marker, this, level, msg, params, t); if (decision == FilterReply.NEUTRAL) { if (effectiveLevelInt > level.levelInt) { @@ -817,8 +815,7 @@ level = Level.ERROR; break; default: - throw new IllegalArgumentException(levelInt - + " not a valid level value"); + throw new IllegalArgumentException(levelInt + " not a valid level value"); } filterAndLog(fqcn, marker, level, message, null, t); }