summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2006-12-04 21:44:32 +0000
committerMark Wielaard <mark@klomp.org>2006-12-04 21:44:32 +0000
commit4194ff12e5b702431daa956274cd2abaef46f1e2 (patch)
treeac603517655ec05ab966b101528c56a64dbdd295 /java
parentae3657126b078d34836c5cfcd99d156f99181b30 (diff)
downloadclasspath-4194ff12e5b702431daa956274cd2abaef46f1e2.tar.gz
* java/util/logging/LogManager.java (getLevelProperty): Check
whether value is null before passing to Level.parse().
Diffstat (limited to 'java')
-rw-r--r--java/util/logging/LogManager.java6
1 files changed, 5 insertions, 1 deletions
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)
{