From d689cc07419bec2bcd565b1460819bcd0cbd55ca Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 13 May 2013 16:07:16 +0400 Subject: [PATCH] Using 'desc' instead of 'erasedSignature' --- .../preloading/instrumentation/InterceptionInstrumenter.java | 2 +- .../jet/preloading/instrumentation/MethodInterceptor.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java index 3314d87b3c8..8bbe961ae71 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java @@ -114,7 +114,7 @@ public class InterceptionInstrumenter { field.getDeclaringClass().getSimpleName() + "." + field.getName(), classPattern, compilePattern(methodName), - compilePattern(annotation.erasedSignature()), + compilePattern(annotation.methodDesc()), annotation.allowMultipleMatches(), enterData, normalReturnData, diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodInterceptor.java b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodInterceptor.java index 0740b17c54e..bdad692e2bb 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodInterceptor.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodInterceptor.java @@ -30,8 +30,8 @@ public @interface MethodInterceptor { // regexp, if omitted, field name is used String methodName() default ""; - // regexp - String erasedSignature() default ""; + // regexp for method descriptor, like (ILjava/lang/Object;)V for void foo(int, Object) + String methodDesc() default ""; // if this is false, an exception is thrown when more than one method in the same class matches boolean allowMultipleMatches() default false;