--- a/src/JavaFieldRef2.st	Sun May 15 20:50:09 2011 +0000
+++ b/src/JavaFieldRef2.st	Wed May 18 10:45:12 2011 +0000
@@ -42,30 +42,31 @@
 !JavaFieldRef2 methodsFor:'private - resolving'!
 
 findResolvedStaticValue
-    | class |
-    self breakPoint:#mh.
     valueCache := JavaResolver uniqueInstance 
                 resolveStaticFieldIndentifiedByRef: self.
-    class := (constantPool at: classRefIndex) resolve.
-    class ifNil: [self breakPoint:#mh].
-    class ifNotNil: [ offset := class class instVarOffsetOf: self name ].
-     self resolveType.
+    classCache := (constantPool at: classRefIndex) resolve.
+    classCache ifNil: [ self breakPoint: #mh ].
+    classCache 
+        ifNotNil: [ offset := classCache class instVarOffsetOf: self name ].
+    nameAndTypeCache := (constantPool at: nameAndTypeIndex) resolve.
+    self resolveType.
+   nameAndTypeCache ifNil: [self breakPoint: #mh].
 
     "Created: / 28-04-2011 / 22:05:10 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 15-05-2011 / 22:51:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 18-05-2011 / 12:44:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 findResolvedValue
-    | class |
-
     valueCache := JavaResolver uniqueInstance 
                 resolveFieldIndentifiedByRef: self.
-    class := (constantPool at: classRefIndex) resolve.
-    class ifNil: [self breakPoint:#mh].
-    class ifNotNil: [ offset := class instVarOffsetOf: self name ].
+    classCache := (constantPool at: classRefIndex) resolve.
+    classCache ifNil: [ self breakPoint: #mh ].
+    classCache ifNotNil: [ offset := classCache instVarOffsetOf: self name ].
+    nameAndTypeCache := (constantPool at: nameAndTypeIndex) resolve.
     self resolveType.
+   nameAndTypeCache ifNil: [self breakPoint: #mh].
 
-    "Modified: / 15-05-2011 / 22:50:11 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 18-05-2011 / 12:44:17 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 resolveType