diff -ru CVS/classpath/java/util/logging/Handler.java updated/classpath/java/util/logging/Handler.java
--- CVS/classpath/java/util/logging/Handler.java	2010-06-20 10:39:56.000000000 +0400
+++ updated/classpath/java/util/logging/Handler.java	2010-06-20 10:47:46.000000000 +0400
@@ -1,5 +1,5 @@
 /* Handler.java -- a class for publishing log messages
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -179,10 +179,8 @@
     throws SecurityException
   {
     LogManager.getLogManager().checkAccess();
-
-    /* Throws a NullPointerException if formatter is null. */
-    formatter.getClass();
-
+    if (formatter == null)
+      throw new NullPointerException();
     this.formatter = formatter;
   }
 
@@ -288,13 +286,18 @@
   }
 
 
+  /**
+   * Sets the error manager which will be invoked on errors occur while
+   * using this handler.
+   *
+   * @exception NullPointerException If <code>manager</code> is
+   * <code>null</code>
+   */
   public void setErrorManager(ErrorManager manager)
   {
     LogManager.getLogManager().checkAccess();
-
-    /* Make sure manager is not null. */
-    manager.getClass();
-
+    if (manager == null)
+      throw new NullPointerException();
     this.errorManager = manager;
   }
 
@@ -342,9 +345,8 @@
   public void setLevel(Level level)
   {
     LogManager.getLogManager().checkAccess();
-
-    /* Throw NullPointerException if level is null.  */
-    level.getClass();
+    if (level == null)
+      throw new NullPointerException();
     this.level = level;
   }
 
diff -ru CVS/classpath/java/util/logging/LogManager.java updated/classpath/java/util/logging/LogManager.java
--- CVS/classpath/java/util/logging/LogManager.java	2010-06-20 10:40:18.000000000 +0400
+++ updated/classpath/java/util/logging/LogManager.java	2010-06-20 10:48:54.000000000 +0400
@@ -1,6 +1,6 @@
 /* LogManager.java -- a class for maintaining Loggers and managing
    configuration properties
-   Copyright (C) 2002, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2006, 2007, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -211,11 +211,15 @@
   /**
    * Registers a listener which will be notified when the
    * logging properties are re-read.
+   *
+   * @exception NullPointerException If <code>listener</code> is
+   * <code>null</code>
    */
   public synchronized void addPropertyChangeListener(PropertyChangeListener listener)
   {
     /* do not register null. */
-    listener.getClass();
+    if (listener == null)
+      throw new NullPointerException();
 
     pcs.addPropertyChangeListener(listener);
   }
@@ -402,9 +406,8 @@
   public synchronized Logger getLogger(String name)
   {
     WeakReference<Logger> ref;
-
-    /* Throw a NullPointerException if name is null. */
-    name.getClass();
+    if (name == null)
+      throw new NullPointerException();
 
     ref = loggers.get(name);
     if (ref != null)
@@ -718,7 +721,7 @@
       {
         String value = getLogManager().getProperty(propertyName);
         if (value != null)
-          return Level.parse(getLogManager().getProperty(propertyName));
+          return Level.parse(value);
         else
            return defaultValue;
       }
diff -ru CVS/classpath/java/util/logging/Logger.java updated/classpath/java/util/logging/Logger.java
--- CVS/classpath/java/util/logging/Logger.java	2010-06-20 10:40:36.000000000 +0400
+++ updated/classpath/java/util/logging/Logger.java	2010-06-20 10:42:18.000000000 +0400
@@ -1,5 +1,5 @@
 /* Logger.java -- a class for logging messages
-   Copyright (C) 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006, 2007, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -202,7 +202,7 @@
    *            package issuing log records and consist of dot-separated Java
    *            identifiers.
    * @throws IllegalArgumentException if a logger for the subsystem identified
-   *             by <code>name</code> has already been created, but uses a a
+   *             by <code>name</code> has already been created, but uses a
    *             resource bundle for localizing messages.
    * @throws NullPointerException if <code>name</code> is <code>null</code>.
    * @return a logger for the subsystem specified by <code>name</code> that
diff -ru CVS/classpath/java/util/logging/MemoryHandler.java updated/classpath/java/util/logging/MemoryHandler.java
--- CVS/classpath/java/util/logging/MemoryHandler.java	2010-06-20 10:40:50.000000000 +0400
+++ updated/classpath/java/util/logging/MemoryHandler.java	2010-06-20 10:42:18.000000000 +0400
@@ -1,5 +1,5 @@
 /* MemoryHandler.java -- a class for buffering log messages in a memory buffer
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -336,10 +336,8 @@
   public void setPushLevel(Level pushLevel)
   {
     LogManager.getLogManager().checkAccess();
-
-    /* Throws a NullPointerException if pushLevel is null. */
-    pushLevel.getClass();
-
+    if (pushLevel == null)
+      throw new NullPointerException();
     this.pushLevel = pushLevel;
   }
 }
diff -ru CVS/classpath/java/util/logging/StreamHandler.java updated/classpath/java/util/logging/StreamHandler.java
--- CVS/classpath/java/util/logging/StreamHandler.java	2010-06-20 10:41:02.000000000 +0400
+++ updated/classpath/java/util/logging/StreamHandler.java	2010-06-20 10:42:18.000000000 +0400
@@ -1,6 +1,6 @@
 /* StreamHandler.java --
    A class for publishing log messages to instances of java.io.OutputStream
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -285,9 +285,8 @@
     throws SecurityException
   {
     LogManager.getLogManager().checkAccess();
-
-    /* Throw a NullPointerException if out is null. */
-    out.getClass();
+    if (out == null)
+      throw new NullPointerException();
 
     try
     {