2005-01-06 Michael Koch <konqueror@gmx.de>

	* java/util/TimeZone.java
	(setID): Throw NullPointerException if needed.

2 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 0d50dd84a..16a0eadbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-06  Michael Koch  <konqueror@gmx.de>
+
+	* java/util/TimeZone.java
+	(setID): Throw NullPointerException if needed.
+
 2005-01-05  Mark Wielaard  <mark@klomp.org>
 
 	* lib/gen-classlist.sh.in: Don't split locales in classes.locale1
diff --git a/java/util/TimeZone.java b/java/util/TimeZone.java
index 39cdcd3e2..0685e6046 100644
--- a/java/util/TimeZone.java
+++ b/java/util/TimeZone.java
@@ -989,9 +989,13 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
    * Sets the identifier of this time zone. For instance, PST for
    * Pacific Standard Time.
    * @param id the new time zone ID.
+   * @throws NullPointerException if <code>id</code> is <code>null</code>
    */
   public void setID(String id)
   {
+    if (id == null)
+      throw new NullPointerException();
+    
     this.ID = id;
   }