--- a/JavaMethodRef2.st	Wed Jan 29 17:27:26 2014 +0000
+++ b/JavaMethodRef2.st	Thu Jan 30 23:40:39 2014 +0000
@@ -70,32 +70,14 @@
 
 !JavaMethodRef2 methodsFor:'private - resolving'!
 
-findResolvedStaticValue
-    <resource: #obsolete>
-"/    Logger 
-"/        log: self printString 
-"/                , ': findResolvedStaticValue is obsolete, call resolve its safe :)'
-"/        severity: #info
-"/        facility: #JVM.
-    self findResolvedValue.
-
-    "Created: / 28-04-2011 / 22:45:53 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 07-12-2011 / 15:10:51 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 07-12-2011 / 21:07:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
 findResolvedValue: doClassInit
     "Resolve reference and set valueCache."
-    
-    valueCache := JavaResolver uniqueInstance 
+
+    valueCache := JavaResolver uniqueInstance
                 resolveMethodIndentifiedByRef: self.
-    classCache := self classRef resolve: doClassInit.
-    classCache isNil ifTrue: [ self breakPoint: #mh ].
+    classCache := valueCache javaClass.
+    doClassInit ifTrue:[  classCache classInit ].
     nameAndTypeCache := (constantPool at: nameAndTypeIndex) resolve.
-    nameAndTypeCache isNil ifTrue: [ self breakPoint: #mh ].
-    selectorCache isNil ifTrue: [
-        selectorCache := (nameAndTypeCache name , nameAndTypeCache descriptor) asSymbol
-    ].
 
     "Modified: / 18-05-2011 / 12:44:07 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Created: / 09-02-2012 / 23:10:32 / mh <hlopik@gmail.com>"
@@ -127,7 +109,7 @@
     numArgSlotsCache := JavaMethod numArgsFromSignature: nameAndTypeCache descriptor.
     returnTypeChar := nameAndTypeCache descriptor last.
     returnTypeChar == $V ifTrue:[
-        returnTypeCache := JavaMethod r_void.    
+        returnTypeCache := JavaMethod r_void.
     ] ifFalse:[
         returnTypeChar == $J ifTrue:[
             returnTypeCache := JavaMethod r_long.