* java/io/Writer.java (Writer(Object)): Check for null lock object.

From-SVN: r81921

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 92ce3f64f7188765d917a902fe98a2c0f26283c2..4da17099d098358eddaa11287314851f1fbb3a86 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-16  Mark Wielaard  <mark@klomp.org>
+
+       * java/io/Writer.java (Writer(Object)): Check for null lock object.
+
+
 2004-05-15  Mark Wielaard  <mark@klomp.org>
 
        * doc/cni.sgml: Removed, merged into gcj.texi.

diff --git a/libjava/java/io/Writer.java b/libjava/java/io/Writer.java
index 60939c8ce99a5ca831c0576a3daba1ae4dd275b7..8248c5556d4b12f51e41ba8f4925e9f6ef3eaf46 100644 (file)
--- a/libjava/java/io/Writer.java
+++ b/libjava/java/io/Writer.java
@@ -1,5 +1,5 @@
 /* Writer.java -- Base class for character output streams
-   Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2001, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -76,10 +76,13 @@ public abstract class Writer
    * on the specified <code>Object</code>.
    *
    * @param lock The <code>Object</code> to use for synchronizing critical
-   *             sections
+   *             sections. Must be not be null.
    */
   protected Writer(Object lock)
   {
+    if (lock == null)
+      throw new NullPointerException();
+
     this.lock = lock;
   }