From bd90919d6200a2bc6782898dee0045e4e1b6e7a8 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sun, 3 Dec 2006 22:24:16 +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 6ac308db5..f401a9af0 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-03 Mark Wielaard * javax/swing/JEditorPane.java (PageLoader.in): Made a PageStream. diff --git a/java/util/logging/LogManager.java b/java/util/logging/LogManager.java index d3df5fc9d..aec63633a 100644 --- a/java/util/logging/LogManager.java +++ b/java/util/logging/LogManager.java @@ -710,7 +710,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