284771: before tjp clashing advice sigs dont get counter suffix

diff --git a/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java b/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java
index 074ab932131cc0acbfb8d689ba10d48fa5b1e628..2954f2780ad297fff0ab87101ef2b7dab220f139 100644 (file)
--- a/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java
+++ b/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java
@@ -226,6 +226,19 @@ public class JDTLikeHandleProvider implements IElementHandleProvider {
                        if (ipeSig != null && ((idx = ipeSig.indexOf(")")) != -1)) {
                                ipeSig = ipeSig.substring(0, idx);
                        }
+                       if (ipeSig != null) {
+                               if (ipeSig.indexOf("Lorg/aspectj/lang") != -1) {
+                                       if (ipeSig.endsWith("Lorg/aspectj/lang/JoinPoint$StaticPart;")) {
+                                               ipeSig = ipeSig.substring(0, ipeSig.lastIndexOf("Lorg/aspectj/lang/JoinPoint$StaticPart;"));
+                                       }
+                                       if (ipeSig.endsWith("Lorg/aspectj/lang/JoinPoint;")) {
+                                               ipeSig = ipeSig.substring(0, ipeSig.lastIndexOf("Lorg/aspectj/lang/JoinPoint;"));
+                                       }
+                                       if (ipeSig.endsWith("Lorg/aspectj/lang/JoinPoint$StaticPart;")) {
+                                               ipeSig = ipeSig.substring(0, ipeSig.lastIndexOf("Lorg/aspectj/lang/JoinPoint$StaticPart;"));
+                                       }
+                               }
+                       }
                        for (Iterator iterator = kids.iterator(); iterator.hasNext();) {
                                IProgramElement object = (IProgramElement) iterator.next();
                                if (object.equals(ipe)) {