From 08b7d9e41e05df9956c5da1514a2edd29567a0ac Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Mon, 27 Jul 2009 17:27:25 +0000
Subject: [PATCH] 284771: before tjp clashing advice sigs dont get counter
 suffix

---
 .../aspectj/asm/internal/JDTLikeHandleProvider.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java b/asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java
index 074ab9321..2954f2780 100644
--- 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)) {
-- 
2.39.5