--- a/Tools__BreakpointService.st Tue Sep 17 16:42:36 2019 +0200
+++ b/Tools__BreakpointService.st Tue Sep 17 23:25:36 2019 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
All Rights Reserved
@@ -260,7 +258,7 @@
].
bpnt notNil ifTrue:[
- bpnt isReached ifFalse:[
+ true "bpnt isReached" ifFalse:[
| app |
app := codeView application.
@@ -602,11 +600,20 @@
class := oldMethod mclass.
class isNil ifTrue:[
- class := codeView classHolder value.
+ class := oldMethod getMclass.
class isNil ifTrue:[
- self breakPoint:#jv.
- Dialog warn:'oops - lost the method''s class'.
- ^ self.
+ class := oldMethod originalMethodIfWrapped mclass.
+ class isNil ifTrue:[
+ class := oldMethod originalMethodIfWrapped getMclass.
+ class isNil ifTrue:[
+ class := codeView classHolder value.
+ class isNil ifTrue:[
+ self breakPoint:#jv.
+ Dialog warn:'oops - lost the method''s class'.
+ ^ self.
+ ]
+ ]
+ ]
]
].
selector := oldMethod selector.