forgot to resolve type in JavaFieldRef2 jk_new_structure
authorhlopkmar
Sun, 15 May 2011 20:50:09 +0000
branchjk_new_structure
changeset 793 bf00d8585c8e
parent 792 14aa43c34268
child 794 9635f32d1723
forgot to resolve type in JavaFieldRef2
src/JavaFieldRef2.st
src/stx_libjava.st
--- a/src/JavaFieldRef2.st	Sun May 15 20:33:45 2011 +0000
+++ b/src/JavaFieldRef2.st	Sun May 15 20:50:09 2011 +0000
@@ -43,14 +43,16 @@
 
 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.
 
     "Created: / 28-04-2011 / 22:05:10 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 15-05-2011 / 22:33:15 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 15-05-2011 / 22:51:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 findResolvedValue
@@ -59,9 +61,11 @@
     valueCache := JavaResolver uniqueInstance 
                 resolveFieldIndentifiedByRef: self.
     class := (constantPool at: classRefIndex) resolve.
+    class ifNil: [self breakPoint:#mh].
     class ifNotNil: [ offset := class instVarOffsetOf: self name ].
+    self resolveType.
 
-    "Modified: / 15-05-2011 / 22:32:51 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 15-05-2011 / 22:50:11 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 resolveType
--- a/src/stx_libjava.st	Sun May 15 20:33:45 2011 +0000
+++ b/src/stx_libjava.st	Sun May 15 20:50:09 2011 +0000
@@ -366,7 +366,7 @@
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"'1135'"$"
+    ^ "$SVN-Revision:"'1136'"$"
 ! !
 
 !stx_libjava class methodsFor:'file generation'!