Changeset 1391 for branches/GNU/src/gcc/libjava/java/io/ObjectStreamClass.java

Timestamp:

Apr 27, 2004, 8:39:34 PM (22 years ago)

Author:

bird

Message:

GCC v3.3.3 sources.

Location:

branches/GNU/src/gcc

Files:

• . (modified) (1 prop)
• libjava/java/io/ObjectStreamClass.java (modified) (15 diffs, 1 prop)

branches/GNU/src/gcc

@@ -26 +26 @@
 configure.vr
 configure.vrs
+
 Makefile
-dir.info
 lost+found
 update.out

@@ -26 +26 @@
 configure.vr
 configure.vrs
+
 Makefile
-dir.info
 lost+found
 update.out

branches/GNU/src/gcc/libjava/java/io/ObjectStreamClass.java

@@ -1 +1 @@
 /* ObjectStreamClass.java -- Class used to write class information
    about serialized objects.
-   Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45 +45 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+
 import java.security.DigestOutputStream;
 import java.security.MessageDigest;
@@ -77 +78 @@
       return null;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
     ObjectStreamClass osc = (ObjectStreamClass)classLookupTable.get (cl);
 
@@ -181 +195 @@
 
   // Returns true iff the class that this ObjectStreamClass represents
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   // implements Serializable but does *not* implement Externalizable.
   boolean isSerializable ()
@@ -261 +297 @@
   {
     this.clazz = cl;
+
     long class_uid = getClassUID (cl);
     if (uid == 0)
-      {
-       uid = class_uid;
-       return;
-      }
-    
-    // Check that the actual UID of the resolved class matches the UID from 
-    // the stream.    
-    if (uid != class_uid)
-      {
-       String msg = cl + 
-         ": Local class not compatible: stream serialVersionUID="
-         + uid + ", local serialVersionUID=" + class_uid;
-       throw new InvalidClassException (msg);
-      }
+      uid = class_uid;
+    else
+      {
+        // Check that the actual UID of the resolved class matches the UID from 
+        // the stream.    
+        if (uid != class_uid)
+          {
+            String msg = cl + 
+              ": Local class not compatible: stream serialVersionUID="
+              + uid + ", local serialVersionUID=" + class_uid;
+            throw new InvalidClassException (msg);
+          }
+      }
+
+    isProxyClass = clazz != null && Proxy.isProxyClass (clazz);
+    ObjectStreamClass osc = (ObjectStreamClass)classLookupTable.get (clazz);
+    if (osc == null)
+      classLookupTable.put (clazz, this);
+    superClass = lookupForClassObject (clazz.getSuperclass ());
+    calculateOffsets ();
   }
 
@@ -329 +372 @@
     uid = 0;
     flags = 0;
+
 
     clazz = cl;
@@ -334 +378 @@
     setFlags (cl);
     setFields (cl);
-    uid = getClassUID (cl);
+    // to those class nonserializable, its uid field is 0
+    if ( (Serializable.class).isAssignableFrom (cl) && !isProxyClass)
+      uid = getClassUID (cl);
     superClass = lookup (cl.getSuperclass ());
   }
@@ -378 +424 @@
       Field serialPersistentFields
         = cl.getDeclaredField ("serialPersistentFields");
+
       int modifiers = serialPersistentFields.getModifiers ();
 
@@ -428 +475 @@
     try
     {
+
+
+
       Field suid = cl.getDeclaredField ("serialVersionUID");
+
       int modifiers = suid.getModifiers ();
 
-      if (Modifier.isStatic (modifiers) && Modifier.isFinal (modifiers))
-        return suid.getLong (null);       
+      if (Modifier.isStatic (modifiers)
+          && Modifier.isFinal (modifiers)
+          && suid.getType() == Long.TYPE)
+        return suid.getLong (null);
     }
     catch (NoSuchFieldException ignore)
-    {
-    }
+    {}
     catch (IllegalAccessException ignore)
-    {
-    }
+    {}
 
     // cl didn't define serialVersionUID, so we have to compute it
     try
     {
-      MessageDigest md = null;
-      DigestOutputStream digest_out = null;
-      DataOutputStream data_out = null;
-
+      MessageDigest md;
       try 
         {
@@ -460 +508 @@
         }
 
-      digest_out = new DigestOutputStream (nullOutputStream, md);
-      data_out = new DataOutputStream (digest_out);
+      DigestOutputStream digest_out =
+        new DigestOutputStream (nullOutputStream, md);
+      DataOutputStream data_out = new DataOutputStream (digest_out);
+
       data_out.writeUTF (cl.getName ());
 
@@ -498 +548 @@
 
       // write class initializer method if present
-      boolean has_init;
-      try
-      {
-        has_init = hasClassInitializer (cl);
-      }
-      catch (NoSuchMethodError e)
-      {
-        has_init = false;
-      }
-
-      if (has_init)
+      if (VMObjectStreamClass.hasClassInitializer (cl))
       {
         data_out.writeUTF ("<clinit>");
@@ -565 +605 @@
     {
       throw new RuntimeException ("The SHA algorithm was not found to use in computing the Serial Version UID for class "
-                                  + cl.getName ());
+                                  + cl.getName ());
     }
     catch (IOException ioe)
     {
-      throw new RuntimeException (ioe.getMessage ());
+      throw new RuntimeException (ioe);
     }
   }
@@ -583 +623 @@
         // as above in getDefinedSUID.
         Field f = clazz.getDeclaredField ("getSerialPersistentFields");
+
         o = (ObjectStreamField[])f.get (null);
       }
@@ -593 +634 @@
 
     return o;
-  }
-
-
-  // Returns true if CLAZZ has a static class initializer
-  // (a.k.a. <clinit>).
-  //
-  // A NoSuchMethodError is raised if CLAZZ has no such method.
-  private static boolean hasClassInitializer (Class clazz)
-    throws java.lang.NoSuchMethodError
-  {
-    Method m = null;
-
-    try
-      {
-        Class classArgs[] = {};
-        m = clazz.getDeclaredMethod ("<clinit>", classArgs);
-      }
-    catch (java.lang.NoSuchMethodException e)
-      {
-        throw new java.lang.NoSuchMethodError ();
-      }
-
-    return m != null;
   }
 
@@ -641 +659 @@
   int objectFieldCount;
 
+
+
   // This is probably not necessary because this class is special cased already
   // but it will avoid showing up as a discrepancy when comparing SUIDs.
   private static final long serialVersionUID = -6120832682080437368L;
+
 }
 

@@ -26 +26 @@
 configure.vr
 configure.vrs
+
 Makefile
-dir.info
 lost+found
 update.out