From 40b86e5f2cf069832e23043992dedb0bf8e0dcd6 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 12 Feb 2007 23:52:39 +0000 Subject: Collections.java (UnmodifiableMap.toArray): Imported changes from Classpath. 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. From-SVN: r121866 --- libjava/classpath/ChangeLog.gcj | 5 +++++ libjava/classpath/java/util/Collections.java | 14 +++++++------- .../lib/gnu/java/net/PlainDatagramSocketImpl.class | Bin 3097 -> 3107 bytes .../net/PlainSocketImpl$SocketInputStream.class | Bin 810 -> 810 bytes .../net/PlainSocketImpl$SocketOutputStream.class | Bin 720 -> 720 bytes .../lib/gnu/java/net/PlainSocketImpl.class | Bin 3295 -> 3586 bytes libjava/classpath/lib/java/net/DatagramSocket.class | Bin 9962 -> 10347 bytes libjava/classpath/lib/java/net/Socket.class | Bin 11073 -> 11289 bytes ...tions$UnmodifiableMap$UnmodifiableEntrySet.class | Bin 2550 -> 2503 bytes 9 files changed, 12 insertions(+), 7 deletions(-) (limited to 'libjava/classpath') diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index 336813b..e50d8f7 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,8 @@ +2007-02-12 Tom Tromey + + * java/util/Collections.java (UnmodifiableMap.toArray): Imported + changes from Classpath. + 2007-02-09 Gary Benson * javax/management/ObjectName.java 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[] toArray() { - Map.Entry[] mapEntryResult = (Map.Entry[]) super.toArray(); + Object[] mapEntryResult = super.toArray(); UnmodifiableMapEntry result[] = null; if (mapEntryResult != null) @@ -5123,21 +5123,21 @@ public class Collections result = (UnmodifiableMapEntry[]) new UnmodifiableMapEntry[mapEntryResult.length]; for (int i = 0; i < mapEntryResult.length; ++i) - result[i] = new UnmodifiableMapEntry(mapEntryResult[i]); + result[i] = new UnmodifiableMapEntry((Map.Entry)mapEntryResult[i]); } return result; } // The array returned is an array of UnmodifiableMapEntry instead of // Map.Entry - public Map.Entry[] toArray(Map.Entry[] array) + public 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(array[i]); + (S) new UnmodifiableMapEntry((Map.Entry) result[i]); return array; } diff --git a/libjava/classpath/lib/gnu/java/net/PlainDatagramSocketImpl.class b/libjava/classpath/lib/gnu/java/net/PlainDatagramSocketImpl.class index 376931b..7ff9c0c 100644 Binary files a/libjava/classpath/lib/gnu/java/net/PlainDatagramSocketImpl.class and b/libjava/classpath/lib/gnu/java/net/PlainDatagramSocketImpl.class differ diff --git a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketInputStream.class b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketInputStream.class index c03ad32..5c42da8 100644 Binary files a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketInputStream.class and b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketInputStream.class differ diff --git a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketOutputStream.class b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketOutputStream.class index 4b93b30..739340f 100644 Binary files a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketOutputStream.class and b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketOutputStream.class differ diff --git a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl.class b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl.class index 7b9e3e8..1e26dd5 100644 Binary files a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl.class and b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl.class differ diff --git a/libjava/classpath/lib/java/net/DatagramSocket.class b/libjava/classpath/lib/java/net/DatagramSocket.class index 033684e..d80af7d 100644 Binary files a/libjava/classpath/lib/java/net/DatagramSocket.class and b/libjava/classpath/lib/java/net/DatagramSocket.class differ diff --git a/libjava/classpath/lib/java/net/Socket.class b/libjava/classpath/lib/java/net/Socket.class index d833b43..b4bb5c0 100644 Binary files a/libjava/classpath/lib/java/net/Socket.class and b/libjava/classpath/lib/java/net/Socket.class differ diff --git a/libjava/classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.class b/libjava/classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.class index 4b9f103..70357f7 100644 Binary files a/libjava/classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.class and b/libjava/classpath/lib/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.class differ -- cgit v1.1