2006-01-12 Roman Kennke <kennke@aicas.com>

	* java/util/Hashtable.java
	(KeyEnumerator.nextElement): Added null check to avoid NPE.
	(ValueEnumerator.nextElement): Added null check to avoid NPE.

2 files changed, 16 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 001e3e322..42f4f8467 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-12  Roman Kennke  <kennke@aicas.com>
+
+	* java/util/Hashtable.java
+	(KeyEnumerator.nextElement): Added null check to avoid NPE.
+	(ValueEnumerator.nextElement): Added null check to avoid NPE.
+
 2006-01-12  Lillian Angel  <langel@redhat.com>
 
 	* javax/swing/text/GapContent.java
diff --git a/java/util/Hashtable.java b/java/util/Hashtable.java
index ba4df6be1..76b0d5c15 100644
--- a/java/util/Hashtable.java
+++ b/java/util/Hashtable.java
@@ -1208,7 +1208,11 @@ public class Hashtable extends Dictionary
      */
     public Object nextElement()
     {
-      return ((HashEntry)super.nextElement()).key;
+      HashEntry entry = (HashEntry) super.nextElement();
+      Object retVal = null;
+      if (entry != null)
+        retVal = entry.key;
+      return retVal;
     }
   } // class KeyEnumerator
 
@@ -1236,7 +1240,11 @@ public class Hashtable extends Dictionary
      */
     public Object nextElement()
     {
-      return ((HashEntry)super.nextElement()).value;
+      HashEntry entry = (HashEntry) super.nextElement();
+      Object retVal = null;
+      if (entry != null)
+        retVal = entry.value;
+      return retVal;
     }
   } // class ValueEnumerator