diff options
Diffstat (limited to 'libjava/classpath/java')
| -rw-r--r-- | libjava/classpath/java/util/Collections.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libjava/classpath/java/util/Collections.java b/libjava/classpath/java/util/Collections.java index c15fa09..77ff6ed 100644 --- a/libjava/classpath/java/util/Collections.java +++ b/libjava/classpath/java/util/Collections.java @@ -5115,7 +5115,7 @@ public class Collections // Map.Entry public Map.Entry<K,V>[] toArray() { - Map.Entry<K,V>[] mapEntryResult = (Map.Entry<K,V>[]) super.toArray(); + Object[] mapEntryResult = super.toArray(); UnmodifiableMapEntry<K,V> result[] = null; if (mapEntryResult != null) @@ -5123,21 +5123,21 @@ public class Collections result = (UnmodifiableMapEntry<K,V>[]) new UnmodifiableMapEntry[mapEntryResult.length]; for (int i = 0; i < mapEntryResult.length; ++i) - result[i] = new UnmodifiableMapEntry(mapEntryResult[i]); + result[i] = new UnmodifiableMapEntry<K,V>((Map.Entry<K,V>)mapEntryResult[i]); } return result; } // The array returned is an array of UnmodifiableMapEntry instead of // Map.Entry - public Map.Entry<K,V>[] toArray(Map.Entry<K,V>[] array) + public <S> S[] toArray(S[] array) { - super.toArray(array); + S[] result = super.toArray(array); - if (array != null) - for (int i = 0; i < array.length; i++) + if (result != null) + for (int i = 0; i < result.length; i++) array[i] = - new UnmodifiableMapEntry<K,V>(array[i]); + (S) new UnmodifiableMapEntry<K,V>((Map.Entry<K,V>) result[i]); return array; } |