From d25492df43f4dc72bae7813aa265588721e72c34 Mon Sep 17 00:00:00 2001 From: samskivert Date: Tue, 9 Feb 2010 20:20:07 +0000 Subject: [PATCH] Break not if getSourceClassName() is null. git-svn-id: https://samskivert.googlecode.com/svn/trunk@2714 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- src/java/com/samskivert/util/OneLineLogFormatter.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/java/com/samskivert/util/OneLineLogFormatter.java b/src/java/com/samskivert/util/OneLineLogFormatter.java index fa89dd2c..5f98355f 100644 --- a/src/java/com/samskivert/util/OneLineLogFormatter.java +++ b/src/java/com/samskivert/util/OneLineLogFormatter.java @@ -73,17 +73,19 @@ public class OneLineLogFormatter extends Formatter if (_showWhere) { // append the log method call context String where = record.getSourceClassName(); + boolean useLoggerName = true; if (where != null) { // strip the package name from the logging class where = where.substring(where.lastIndexOf(".")+1); + // handle legacy log usage patterns + useLoggerName = !(where.equals("Log") || where.equals("LoggingLogProvider") || + where.startsWith("JDK14Logger$Impl")); } - boolean legacy = where.equals("Log") || where.equals("LoggingLogProvider") || - where.startsWith("JDK14Logger$Impl"); - if (legacy) { + if (useLoggerName) { where = record.getLoggerName(); } buf.append(where); - if (record.getSourceMethodName() != null && !legacy) { + if (record.getSourceMethodName() != null && !useLoggerName) { buf.append("."); buf.append(record.getSourceMethodName()); }