diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | java/util/logging/LogManager.java | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2006-12-03 Mark Wielaard <mark@klomp.org> + + * java/util/logging/LogManager.java (getLevelProperty): Check + whether value is null before passing to Level.parse(). + 2006-12-04 Robert Lougher <rob.lougher@gmail.com> * java/lang/management/ThreadInfo.java (ThreadInfo): Check diff --git a/java/util/logging/LogManager.java b/java/util/logging/LogManager.java index 7ff8c509d..fbc0fe78a 100644 --- a/java/util/logging/LogManager.java +++ b/java/util/logging/LogManager.java @@ -708,7 +708,11 @@ public class LogManager { try { - return Level.parse(getLogManager().getProperty(propertyName)); + String value = getLogManager().getProperty(propertyName); + if (value != null) + return Level.parse(getLogManager().getProperty(propertyName)); + else + return defaultValue; } catch (Exception ex) { |