[kaffe] CVS kaffe (guilhem): getField fix

[Kaffe CVS]

PatchSet 5612 
Date: 2005/03/26 18:46:31
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
getField fix


        * kaffe/kaffevm/lookup.c
        (getField): Use the resolved class name to get the name.

        Reported by:  Daniel Bonniot  <Daniel.Bonniot at inria.fr>

Members: 
	ChangeLog:1.3784->1.3785 
	kaffe/kaffevm/lookup.c:1.43->1.44 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3784 kaffe/ChangeLog:1.3785
--- kaffe/ChangeLog:1.3784	Sat Mar 26 10:56:09 2005
+++ kaffe/ChangeLog	Sat Mar 26 18:46:31 2005
@@ -1,3 +1,10 @@
+2005-03-26  Guilhem Lavaux  <guilhem at kaffe.org>
+
+	* kaffe/kaffevm/lookup.c
+	(getField): Use the resolved class name to get the name.
+
+	Reported by:  Daniel Bonniot  <Daniel.Bonniot at inria.fr>
+
 2005-03-26  Supreet Sethi  <supreet at linux-delhi.org>,
 	    Dalibor Topic  <robilad at kaffe.org>
 
Index: kaffe/kaffe/kaffevm/lookup.c
diff -u kaffe/kaffe/kaffevm/lookup.c:1.43 kaffe/kaffe/kaffevm/lookup.c:1.44
--- kaffe/kaffe/kaffevm/lookup.c:1.43	Fri Mar 11 16:41:52 2005
+++ kaffe/kaffe/kaffevm/lookup.c	Sat Mar 26 18:46:34 2005
@@ -265,7 +265,6 @@
 
 	ni = FIELDREF_NAMEANDTYPE(idx, pool);
 
-	ret->cname = WORD2UTF(pool->data[ci]);
 	ret->name = WORD2UTF(pool->data[NAMEANDTYPE_NAME(ni, pool)]);
 	ret->signature = WORD2UTF(pool->data[NAMEANDTYPE_SIGNATURE(ni, pool)]);
 
@@ -279,11 +278,13 @@
 		WORD2UTF(pool->data[NAMEANDTYPE_NAME(ni, pool)])->data, 
 		WORD2UTF(pool->data[NAMEANDTYPE_SIGNATURE(ni, pool)])->data);
     );
+	ret->cname = class->name;
 
 	field = lookupClassField(class, WORD2UTF(pool->data[NAMEANDTYPE_NAME(ni, pool)]), isStaticField, einfo);
 	if (field == 0) {
 		return (false);
 	}
+
 	if (!utf8ConstEqual(field->signature, ret->signature)) {
 		postExceptionMessage(einfo,
 				     JAVA_LANG(NoSuchFieldError),