From aa3241f328f5a37d3383fb2e0dd8c4eb0ea2d601 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Thu, 21 Apr 2005 17:20:36 +0000
Subject: [PATCH] VMClassLoader.java (transformException): Removed.

	* java/lang/VMClassLoader.java (transformException): Removed.
	(resolveClass): No longer native.  Now does nothing.
	* java/lang/natVMClassLoader.cc (resolveClass): Removed.

From-SVN: r98516
---
 libjava/ChangeLog                     |  6 ++++++
 libjava/java/lang/VMClassLoader.java  | 23 ++++-------------------
 libjava/java/lang/natVMClassLoader.cc | 15 ---------------
 3 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d8611531cd1..3acb212e3f8 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-21  Tom Tromey  <tromey@redhat.com>
+
+	* java/lang/VMClassLoader.java (transformException): Removed.
+	(resolveClass): No longer native.  Now does nothing.
+	* java/lang/natVMClassLoader.cc (resolveClass): Removed.
+
 2005-04-21  Anthony Green  <green@redhat.com>
 
 	PR libgcj/21115
diff --git a/libjava/java/lang/VMClassLoader.java b/libjava/java/lang/VMClassLoader.java
index c48fc709991..5566399a6e5 100644
--- a/libjava/java/lang/VMClassLoader.java
+++ b/libjava/java/lang/VMClassLoader.java
@@ -125,26 +125,11 @@ final class VMClassLoader
    *
    * @param c the class to resolve
    */
-  static final native void resolveClass(Class clazz);
-
-  static final void transformException(Class clazz, Throwable x)
+  static final void resolveClass(Class clazz)
   {
-    LinkageError e;
-    if (x instanceof LinkageError)
-      e = (LinkageError) x;
-    else if (x instanceof ClassNotFoundException)
-      {
-	e = new NoClassDefFoundError("while resolving class: "
-				     + clazz.getName());
-	e.initCause (x);
-      }
-    else
-      {
-	e = new LinkageError ("unexpected exception during linking: "
-			      + clazz.getName());
-	e.initCause (x);
-      }
-    throw e;
+    // There doesn't seem to be a need for this to do anything.
+    // Testing reveals that the JDK doesn't seem to do anything here,
+    // either.
   }
 
   /**
diff --git a/libjava/java/lang/natVMClassLoader.cc b/libjava/java/lang/natVMClassLoader.cc
index e7054fb8a76..a94bf98eb99 100644
--- a/libjava/java/lang/natVMClassLoader.cc
+++ b/libjava/java/lang/natVMClassLoader.cc
@@ -35,21 +35,6 @@ details.  */
 #include <java/lang/Runtime.h>
 #include <java/util/HashSet.h>
 
-void
-java::lang::VMClassLoader::resolveClass (jclass klass)
-{
-  JvSynchronize sync (klass);
-  try
-    {
-      _Jv_Linker::wait_for_state (klass, JV_STATE_LINKED);
-    }
-  catch (java::lang::Throwable *x)
-    {
-      klass->set_state(JV_STATE_ERROR);
-      transformException(klass, x);
-    }
-}
-
 java::lang::Class *
 java::lang::VMClassLoader::defineClass (java::lang::ClassLoader *loader,
 					jstring name,
-- 
2.30.2