Makefile.am (core_java_source_files): Add VMObjectStreamClass.java.

       * Makefile.am (core_java_source_files): Add VMObjectStreamClass.java.
       (nat_source_files): Add natVMObjectStreamClass.cc.
       * Makefile.in: Regenerated.
       * gcj/javaprims.h (namespace java): Regenerated.
       * java/io/ObjectStreamClass.java (getClassUID): Call
       VMObjectStreamClass.hasClassInitializer().
       (hasClassInitializer): Removed.
       * java/io/VMObjectStreamClass.java: New class.
       * java/io/natVMObjectStreamClass.cc: New file.
       * java/lang/Class.h: Make java::io::VMObjectStreamClass friend class.

From-SVN: r61501

1 files changed, 1 insertions, 26 deletions

diff --git a/libjava/java/io/ObjectStreamClass.java b/libjava/java/io/ObjectStreamClass.java
index 5d4c102..2111635 100644
--- a/libjava/java/io/ObjectStreamClass.java
+++ b/libjava/java/io/ObjectStreamClass.java
@@ -525,7 +525,7 @@ public class ObjectStreamClass implements Serializable
       }
 
       // write class initializer method if present
-      if (hasClassInitializer (cl))
+      if (VMObjectStreamClass.hasClassInitializer (cl))
       {
 	data_out.writeUTF ("<clinit>");
 	data_out.writeInt (Modifier.STATIC);
@@ -613,31 +613,6 @@ public class ObjectStreamClass implements Serializable
     return o;
   }
 
-
-  // Returns true if CLAZZ has a static class initializer
-  // (a.k.a. <clinit>).
-  private static boolean hasClassInitializer (Class clazz)
-  {
-    Method m = null;
-
-    try
-      {
-	/*
-	 * There exists a problem here, according to the spec
-	 * clazz.getDeclaredMethod ("<clinit>", classArgs);
-	 * will always throw NoSuchMethodException, even if the static 
-	 * intializer does exist.
-	 */
-	Class classArgs[] = {};
-	m = clazz.getDeclaredMethod ("<clinit>", classArgs);
-      }
-    catch (java.lang.NoSuchMethodException e)
-      {
-      }
-
-    return m != null;
-  }
-
   public static final ObjectStreamField[] NO_FIELDS = {};
 
   private static Hashtable classLookupTable = new Hashtable ();