From 2ff35f3cb7ce010140b0f55d49984db326ba4983 Mon Sep 17 00:00:00 2001 From: mdb Date: Fri, 11 Jul 2003 21:00:30 +0000 Subject: [PATCH] Wasn't properly handling module log levels that were more restrictive than the default log level. git-svn-id: https://samskivert.googlecode.com/svn/trunk@1167 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- .../src/java/com/samskivert/util/DefaultLogProvider.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/projects/samskivert/src/java/com/samskivert/util/DefaultLogProvider.java b/projects/samskivert/src/java/com/samskivert/util/DefaultLogProvider.java index 7f3071f1..08b2b4aa 100644 --- a/projects/samskivert/src/java/com/samskivert/util/DefaultLogProvider.java +++ b/projects/samskivert/src/java/com/samskivert/util/DefaultLogProvider.java @@ -1,5 +1,5 @@ // -// $Id: DefaultLogProvider.java,v 1.19 2002/12/22 06:40:02 mdb Exp $ +// $Id: DefaultLogProvider.java,v 1.20 2003/07/11 21:00:30 mdb Exp $ // // samskivert library - useful routines for java programs // Copyright (C) 2001 Michael Bayne @@ -64,8 +64,7 @@ public class DefaultLogProvider implements LogProvider int level, String moduleName, String message) { Integer tlevel = (Integer)_levels.get(moduleName); - if ((tlevel != null && level >= tlevel.intValue()) || - (level >= _level)) { + if (level >= getLevel(moduleName)) { System.err.println(formatEntry(moduleName, level, message)); } } @@ -74,8 +73,7 @@ public class DefaultLogProvider implements LogProvider int level, String moduleName, Throwable t) { Integer tlevel = (Integer)_levels.get(moduleName); - if ((tlevel != null && level >= tlevel.intValue()) || - (level >= _level)) { + if (level >= getLevel(moduleName)) { System.err.println(formatEntry(moduleName, level, t.getMessage())); t.printStackTrace(System.err); }