From: Tom Tromey <tromey@redhat.com>
Date: Fri, 9 Mar 2001 01:35:54 +0000 (+0000)
Subject: re PR libgcj/1971 (ObjectOutputStream generates incorrect serialVersionUID's for... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6771219aaaea365352a4edece9d20f5e74460896;p=gcc.git

re PR libgcj/1971 (ObjectOutputStream generates incorrect serialVersionUID's for array classes)

	* 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 9de90404a17..ce7250e71cb 100644
--- 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 d7306f81b74..eca172a4e39 100644
--- 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 ();