2004-01-09 Andrew Haley <aph@redhat.com>

	* java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass): Resolve
	a Utf8Const field before looking at its class.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75591 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8a04fae..5a4860b 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-09  Andrew Haley  <aph@redhat.com>
+
+       * java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass): Resolve
+       a Utf8Const field before looking at its class.
+
 2004-01-09  Michael Koch  <konqueror@gmx.de>
 
        * javax/print/attribute/standard/DocumentName.java,

diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index 5e7c943..4f15930 100644 (file)
--- a/libjava/java/lang/natClassLoader.cc
+++ b/libjava/java/lang/natClassLoader.cc
@@ -262,6 +262,7 @@ _Jv_PrepareCompiledClass (jclass klass)
          int mod = f->getModifiers ();
          // If we have a static String field with a non-null initial
          // value, we know it points to a Utf8Const.
+         _Jv_ResolveField(f, klass->loader);
          if (f->getClass () == &java::lang::String::class$
              && java::lang::reflect::Modifier::isStatic (mod))
            {