From c3c147306bab7d0e29422e18cc8ab58a031fd4ad Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 12 Feb 2007 23:52:39 +0000
Subject: libjava/classpath 	* java/util/Collections.java
 (UnmodifiableMap.toArray): Imported 	changes from Classpath. libjava 
 * sources.am, Makefile.in: Rebuilt. 	* java/lang/Socket.java: Removed
 override. 	* java/lang/DatagramSocket.java: Removed override. 	*
 gnu/java/net/PlainSocketImpl.java (localSocketAddress): New 	field. 
 (getLocalAddress): New method. 	*
 gnu/java/net/PlainDatagramSocketImpl.java 	(PlainDatagramSocketImpl):
 Throws IOException. 	* gnu/java/net/natPlainSocketImplPosix.cc (write):
 Remove 	'sizeof'. 	(read): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121866 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/classpath/java/util/Collections.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'libjava/classpath/java/util/Collections.java')

diff --git a/libjava/classpath/java/util/Collections.java b/libjava/classpath/java/util/Collections.java
index c15fa092bb2..77ff6ed8fa0 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;
       }
       
-- 
cgit v1.2.1