aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2005-04-19 06:36:10 +0000
committerTom Tromey <tromey@gcc.gnu.org>2005-04-19 06:36:10 +0000
commit8fe0225bf820ca31efe6f5b348866b93fe2c387b (patch)
tree2d3c34ae28bad58454714881cc970c629ea16139
parent117e7444100cb71032790d2f997b4bb43c1da83b (diff)
downloadgcc-8fe0225bf820ca31efe6f5b348866b93fe2c387b.zip
gcc-8fe0225bf820ca31efe6f5b348866b93fe2c387b.tar.gz
gcc-8fe0225bf820ca31efe6f5b348866b93fe2c387b.tar.bz2
natVMClassLoader.cc (loadClass): Call resolveClass, not _Jv_InitClass.
* java/lang/natVMClassLoader.cc (loadClass): Call resolveClass, not _Jv_InitClass. From-SVN: r98388
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/lang/natVMClassLoader.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fbe8023..6091c6b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-19 Tom Tromey <tromey@redhat.com>
+
+ * java/lang/natVMClassLoader.cc (loadClass): Call resolveClass,
+ not _Jv_InitClass.
+
2005-04-19 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/basic/BasicMenuBarUI.java:
diff --git a/libjava/java/lang/natVMClassLoader.cc b/libjava/java/lang/natVMClassLoader.cc
index 182b8d7..e7054fb 100644
--- a/libjava/java/lang/natVMClassLoader.cc
+++ b/libjava/java/lang/natVMClassLoader.cc
@@ -216,7 +216,7 @@ java::lang::VMClassLoader::loadClass(jstring name, jboolean resolve)
// It isn't clear from the spec, but this is what other
// implementations do in practice.
if (resolve)
- _Jv_InitClass (klass);
+ resolveClass (klass);
else
_Jv_Linker::wait_for_state (klass, JV_STATE_LOADING);