aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2008-03-24 18:36:58 +0000
committeraclement <aclement>2008-03-24 18:36:58 +0000
commit81d417ed1a5377d371443b8e94c3ba4c0112770f (patch)
tree223ceb9823fedb79afbad530f57bdb83b19ce279
parente372e390116d3d90f3ed5f6d8d1689c29932655f (diff)
downloadaspectj-81d417ed1a5377d371443b8e94c3ba4c0112770f.tar.gz
aspectj-81d417ed1a5377d371443b8e94c3ba4c0112770f.zip
223605: itd on generic type: test and fix
-rw-r--r--weaver/src/org/aspectj/weaver/patterns/TypePattern.java6
1 files changed, 5 insertions, 1 deletions
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