From 7a2087ef985e8af73045bac1e7e0195bb87c7f40 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Tue, 21 Feb 2006 15:52:36 +0000
Subject: test and fix for 128744 (or at least the LTW problem Sian hit whilst
 debugging it...)

---
 .../src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'loadtime')

diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java b/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java
index ff1ea65cf..bb6af4aac 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java
@@ -164,7 +164,14 @@ public class ConcreteAspectCodeGen {
             ResolvedMember method = (ResolvedMember) methods.next();
             if (method.isAbstract()) {
                 if ("()V".equals(method.getSignature())) {
-                    elligibleAbstractions.add(method.getName());
+                	String n = method.getName();
+                	if (n.startsWith("ajc$pointcut")) { // Allow for the abstract pointcut being from a code style aspect compiled with -1.5 (see test for 128744)
+                		n = n.substring(14);
+                		n = n.substring(0,n.indexOf("$"));
+                		elligibleAbstractions.add(n);
+                	} else {
+                		elligibleAbstractions.add(method.getName());
+                	}
                 } else {
                     reportError("Abstract method '" + method.getName() + "' cannot be concretized as a pointcut (illegal signature, must have no arguments, must return void): " + stringify());
                     return false;
-- 
cgit v1.2.3