--- a/src/JavaNameAndType2.st	Wed May 18 10:45:12 2011 +0000
+++ b/src/JavaNameAndType2.st	Wed May 18 11:19:08 2011 +0000
@@ -1,7 +1,7 @@
 "{ Package: 'stx:libjava' }"
 
 Object subclass:#JavaNameAndType2
-	instanceVariableNames:'nameIndex descriptorIndex constantPool'
+	instanceVariableNames:'constantPool nameIndex descriptorIndex nameCache descriptorCache'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Languages-Java-Reader-Support-new'
@@ -173,6 +173,16 @@
 
 !JavaNameAndType2 methodsFor:'resolving'!
 
+resolve
+    nameCache := constantPool at: nameIndex.
+    descriptorCache := constantPool at: descriptorIndex.
+    (nameCache isNil or: [ descriptorCache isNil ]) 
+        ifTrue: [ self breakPoint: #mh ].
+    ^self.
+
+    "Created: / 18-05-2011 / 13:19:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+!
+
 updateClassRefsFrom: oldOwner to: newOwner 
     self owner = oldOwner ifTrue: [ self owner: newOwner. ].
     self info: 'updating class refs from: ' , oldOwner printString , ' to ' 

--- a/src/stx_libjava.st	Wed May 18 10:45:12 2011 +0000
+++ b/src/stx_libjava.st	Wed May 18 11:19:08 2011 +0000
@@ -366,7 +366,7 @@
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"'1136'"$"
+    ^ "$SVN-Revision:"'1138'"$"
 ! !
 
 !stx_libjava class methodsFor:'file generation'!