diff options
| author | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-09 17:10:43 +0000 |
|---|---|---|
| committer | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-09 17:10:43 +0000 |
| commit | 5c813017110ed86b1b7200dabfc61a57f4666cbe (patch) | |
| tree | e67ef04df5f8f972645ab4cc9494e99f687eed44 /libjava | |
| parent | 757f6c6c12a8ce0b42a6ac1f27df9c99da15947d (diff) | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8a04fae492b..5a4860b2d6a 100644 --- 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 5e7c943c620..4f15930e1ae 100644 --- 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)) { |