323417 "Sometimes StackOverflow is got while weaving"

org.aspectj.matcher/src/org/aspectj/weaver/World.java

 				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);
 						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) {
 							/*