From 81d417ed1a5377d371443b8e94c3ba4c0112770f Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Mon, 24 Mar 2008 18:36:58 +0000
Subject: [PATCH] 223605: itd on generic type: test and fix

---
 weaver/src/org/aspectj/weaver/patterns/TypePattern.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/weaver/src/org/aspectj/weaver/patterns/TypePattern.java b/weaver/src/org/aspectj/weaver/patterns/TypePattern.java
index dcd453fa6..ddd8e598e 100644
--- a/weaver/src/org/aspectj/weaver/patterns/TypePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/TypePattern.java
@@ -158,7 +158,11 @@ public abstract class TypePattern extends PatternNode {
 		if (type.isTypeVariableReference()) {
 			typesIterator = ((TypeVariableReference)type).getTypeVariable().getFirstBound().resolve(type.getWorld()).getDirectSupertypes();
 		} else {
-			typesIterator = type.getDirectSupertypes();
+            // pr223605
+            if (type.isRawType()) {
+                type = type.getGenericType();
+            }
+            typesIterator = type.getDirectSupertypes();
 		}
 		
 		// FuzzyBoolean ret = FuzzyBoolean.NO; // ??? -eh
-- 
2.39.5