2005-04-26 Andrew Haley <aph@redhat.com>

	PR libgcj/21020:
	* jni.cc (_Jv_JNI_GetAnyFieldID): Use class' loader to find
	field's type.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d32eb9e2d0a80547622ee732e3b9ab57af135350..c0868e5e741d483b096da51446c2691e35c48414 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-26  Andrew Haley  <aph@redhat.com>
+
+       PR libgcj/21020:
+       * jni.cc (_Jv_JNI_GetAnyFieldID): Use class' loader to find
+       field's type.
+
 2005-04-26  Tom Tromey  <tromey@redhat.com>
 
        * javax/swing/text/html/parser/ParserDelegator.java (callBack,

diff --git a/libjava/jni.cc b/libjava/jni.cc
index cf4d04750444394241643c257943f4a3bdf63a8c..a54aea949ff018bce0b7ea121c4d7410c7628794 100644 (file)
--- a/libjava/jni.cc
+++ b/libjava/jni.cc
@@ -1200,11 +1200,11 @@ _Jv_JNI_GetAnyFieldID (JNIEnv *env, jclass clazz,
       char s[len + 1];
       for (int i = 0; i <= len; ++i)
        s[i] = (sig[i] == '/') ? '.' : sig[i];
-      jclass field_class = _Jv_FindClassFromSignature ((char *) s, NULL);
+      java::lang::ClassLoader *loader = clazz->getClassLoaderInternal ();
+      jclass field_class = _Jv_FindClassFromSignature ((char *) s, loader);
       if (! field_class)
        throw new java::lang::ClassNotFoundException(JvNewStringUTF(s));
 
-      java::lang::ClassLoader *loader = clazz->getClassLoaderInternal ();
       while (clazz != NULL)
        {
          // We acquire the class lock so that fields aren't resolved