From: aclement <aclement>
Date: Wed, 25 Aug 2010 01:46:42 +0000 (+0000)
Subject: 323417 "Sometimes StackOverflow is got while weaving"
X-Git-Tag: V1_6_10RC1~14
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f631ad6e4e37f43bfae556fc966e6ab0d7ee38bf;p=aspectj.git

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 53b0bfd83..ce52537c0 100644
--- 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) {
 							/*