From baa647c76001d01a7a973861444b541940e4035f Mon Sep 17 00:00:00 2001
From: chiba <chiba@30ef5769-5b8d-40dd-aea6-55b5d6557bb3>
Date: Thu, 5 Oct 2006 15:43:49 +0000
Subject: [PATCH] fixed a bug in CodeConverter#replaceFieldRead/Write() on
 field shadowing

git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@323 30ef5769-5b8d-40dd-aea6-55b5d6557bb3
---
 Readme.html                                        |  6 ++++++
 src/main/javassist/convert/TransformReadField.java | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/Readme.html b/Readme.html
index b988a781..ff1324cf 100644
--- a/Readme.html
+++ b/Readme.html
@@ -281,6 +281,12 @@ see javassist.Dump.
 
 <h2>Changes</h2>
 
+<p>-version 3.4
+<ul>
+	<li>A bug in CodeConverter#replaceFieldRead() and CodeConverter#replaceFieldWrite()
+	was fixed. <a href="http://jira.jboss.com/jira/browse/JBAOP-284">JBAOP-284</a>.
+</ul>
+
 <p>-version 3.3 on August 17, 2006
 <ul>
     <li>CtClass#toClass() and ClassPool#toClass() were modified to accept a
diff --git a/src/main/javassist/convert/TransformReadField.java b/src/main/javassist/convert/TransformReadField.java
index ad490f88..af6a4631 100644
--- a/src/main/javassist/convert/TransformReadField.java
+++ b/src/main/javassist/convert/TransformReadField.java
@@ -46,13 +46,25 @@ public class TransformReadField extends Transformer {
 
         try {
             CtClass c = pool.get(cp.getFieldrefClassName(index));
-            if (is_private ? c == fclass : c.subclassOf(fclass))
+            if (c == fclass || (!is_private && isFieldInSuper(c, fclass, fname)))
                 return cp.getFieldrefType(index);
         }
         catch (NotFoundException e) {}
         return null;
     }
 
+    static boolean isFieldInSuper(CtClass clazz, CtClass fclass, String fname) {
+        if (!clazz.subclassOf(fclass))
+            return false;
+
+        try {
+            CtField f = clazz.getField(fname);
+            return f.getDeclaringClass() == fclass;
+        }
+        catch (NotFoundException e) {}
+        return false;
+    }
+
     public int transform(CtClass tclazz, int pos, CodeIterator iterator,
                          ConstPool cp) throws BadBytecode
     {
-- 
2.39.5