241047: test and fix: when pipelining we have to ask the generic type for its super...

diff --git a/weaver/src/org/aspectj/weaver/patterns/TypePattern.java b/weaver/src/org/aspectj/weaver/patterns/TypePattern.java
index ddd8e598e9ee8b5607d684ebbee246e7fd765518..1336ea863efb66df0db818253831bb4144be0e4e 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/TypePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/TypePattern.java
@@ -181,7 +181,10 @@ public abstract class TypePattern extends PatternNode {
                        //System.out.println("    true");
                        return true;
                }
-               
+               // If an ITD is applied, it will be put onto the generic type, not the parameterized or raw form
+               if (superType.isParameterizedType() || superType.isRawType()) {
+                       superType = superType.getGenericType();
+               }
                // FuzzyBoolean ret = FuzzyBoolean.NO; // ??? -eh
                for (Iterator i = superType.getDirectSupertypes(); i.hasNext(); ) {
                        ResolvedType superSuperType = (ResolvedType)i.next();