323417 "Sometimes StackOverflow is got while weaving"

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/World.java b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
index 53b0bfd8387a2bcae6e5fb69ecdc6cecbcc605a7..ce52537c0614a4a24dd2f027da172ab95dc0a09e 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/World.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
@@ -1067,9 +1067,6 @@ public abstract class World implements Dump.INode {
                                for (String key : addedSinceLastDemote) {
                                        ResolvedType type = tMap.get(key);
                                        if (type != null && !type.isAspect() && !type.equals(UnresolvedType.OBJECT) && !type.isPrimitiveType()) {
-                                               if (type.isParameterizedOrRawType()) {
-                                                       type = type.getGenericType();
-                                               }
                                                List<ConcreteTypeMunger> typeMungers = type.getInterTypeMungers();
                                                if (typeMungers == null || typeMungers.size() == 0) {
                                                        tMap.remove(key);
@@ -1093,9 +1090,6 @@ public abstract class World implements Dump.INode {
                                                continue;
                                        }
                                        if (type != null && !type.isAspect() && !type.equals(UnresolvedType.OBJECT) && !type.isPrimitiveType()) {
-                                               if (type.isParameterizedOrRawType()) {
-                                                       type = type.getGenericType();
-                                               }
                                                List<ConcreteTypeMunger> typeMungers = type.getInterTypeMungers();
                                                if (typeMungers == null || typeMungers.size() == 0) {
                                                        /*