summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2006-10-21 23:18:10 +0000
committerTom Tromey <tromey@redhat.com>2006-10-21 23:18:10 +0000
commitbe24db70d4ff66302f560e12913f5b71acf3c12c (patch)
treeeea6b12036815acc2adc1ddcbbfac917cbbc8f97
parent3e2c3a6cf9e3123f8e56634433724408f77f7a30 (diff)
downloadclasspath-be24db70d4ff66302f560e12913f5b71acf3c12c.tar.gz
PR classpath/29086:
* java/util/AbstractCollection.java (toArray): Removed cast.
-rw-r--r--ChangeLog5
-rw-r--r--java/util/AbstractCollection.java12
2 files changed, 6 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index fc3686e81..fe554bf01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-21 Tom Tromey <tromey@redhat.com>
+
+ PR classpath/29086:
+ * java/util/AbstractCollection.java (toArray): Removed cast.
+
2006-10-12 Andrew Haley <aph@redhat.com>
* java/lang/InheritableThreadLocal.java: Rename NULL to sentinel.
diff --git a/java/util/AbstractCollection.java b/java/util/AbstractCollection.java
index 7af850b46..ef7434223 100644
--- a/java/util/AbstractCollection.java
+++ b/java/util/AbstractCollection.java
@@ -416,17 +416,7 @@ public abstract class AbstractCollection<E>
Iterator<E> itr = iterator();
for (int pos = 0; pos < size; pos++)
- {
- try
- {
- a[pos] = (T) (itr.next());
- }
- catch (ClassCastException exception)
- {
- throw new ArrayStoreException("The element is of the wrong type "+
- "for storing in this array.");
- }
- }
+ a[pos] = (T) (itr.next());
return a;
}