re PR libgcj/1971 (ObjectOutputStream generates incorrect serialVersionUID's for...

	* java/io/ObjectStreamClass.java (setUID): Don't write interface
	info for array classes.
	Fixes PR libgcj/1971.

From-SVN: r40337

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9de90404a17d9680068fa56c43c582a1547bb01d..ce7250e71cb4271e1de0613f6e58c189d1820463 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-08  Tom Tromey  <tromey@redhat.com>
+
+       * java/io/ObjectStreamClass.java (setUID): Don't write interface
+       info for array classes.
+       Fixes PR libgcj/1971.
+
 2001-03-06  Bryce McKinlay  <bryce@albatross.co.nz>
 
        * java/util/TreeSet.java (writeObject): Use a for-loop instead of

diff --git a/libjava/java/io/ObjectStreamClass.java b/libjava/java/io/ObjectStreamClass.java
index d7306f81b74cbda5d195d8ef191a21de8e2d3ef5..eca172a4e39db21cf0051778131da4e34185ebdf 100644 (file)
--- a/libjava/java/io/ObjectStreamClass.java
+++ b/libjava/java/io/ObjectStreamClass.java
@@ -444,11 +444,15 @@ public class ObjectStreamClass implements Serializable
                                | Modifier.INTERFACE | Modifier.PUBLIC);
       data_out.writeInt (modifiers);
 
-      Class[] interfaces = cl.getInterfaces ();
-      Arrays.sort (interfaces, interfaceComparator);
-      for (int i=0; i < interfaces.length; i++)
-       data_out.writeUTF (interfaces[i].getName ());
-
+      // Pretend that an array has no interfaces, because when array
+      // serialization was defined (JDK 1.1), arrays didn't have it.
+      if (! cl.isArray ())
+       {
+         Class[] interfaces = cl.getInterfaces ();
+         Arrays.sort (interfaces, interfaceComparator);
+         for (int i=0; i < interfaces.length; i++)
+           data_out.writeUTF (interfaces[i].getName ());
+       }
 
       Field field;
       Field[] fields = cl.getDeclaredFields ();