From 4194ff12e5b702431daa956274cd2abaef46f1e2 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 4 Dec 2006 21:44:32 +0000 Subject: * java/util/logging/LogManager.java (getLevelProperty): Check whether value is null before passing to Level.parse(). --- ChangeLog | 5 +++++ java/util/logging/LogManager.java | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8e67f3865..552034a5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-12-03 Mark Wielaard + + * java/util/logging/LogManager.java (getLevelProperty): Check + whether value is null before passing to Level.parse(). + 2006-12-04 Robert Lougher * 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) { -- cgit v1.2.1