* java/util/logging/LogManager.java (getLevelProperty): Check

        whether value is null before passing to Level.parse().

2 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ac308db5..f401a9af0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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-03  Mark Wielaard  <mark@klomp.org>
+
 	* javax/swing/JEditorPane.java (PageLoader.in): Made a PageStream.
 	(PageLoader.page): Made package local.
 	(PageLoader.run): Don't reset loader.
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)
       {