From: aclement <aclement>
Date: Wed, 17 Jun 2009 22:27:14 +0000 (+0000)
Subject: 280676: problem 2: allow for target not being generic
X-Git-Tag: V1_6_5~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b98b6999e6b030fb550394d182e6368b4d372ed6;p=aspectj.git

280676: problem 2: allow for target not being generic
---

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
index ac479d6ff..ff74a0926 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
@@ -775,7 +775,8 @@ public class EclipseFactory {
 		ReferenceBinding declaringType = (ReferenceBinding) makeTypeBinding(member.getDeclaringType());
 
 		// If there are aliases, place them in the map
-		if (aliases != null && aliases.size() > 0) {
+		if (aliases != null && aliases.size() > 0 && declaringType.typeVariables() != null
+				&& declaringType.typeVariables().length != 0) {
 			int i = 0;
 			for (Iterator iter = aliases.iterator(); iter.hasNext();) {
 				String element = (String) iter.next();
@@ -858,7 +859,8 @@ public class EclipseFactory {
 		ReferenceBinding declaringType = (ReferenceBinding) makeTypeBinding(member.getDeclaringType());
 
 		// If there are aliases, place them in the map
-		if (aliases != null && aliases.size() != 0) {
+		if (aliases != null && aliases.size() != 0 && declaringType.typeVariables() != null
+				&& declaringType.typeVariables().length != 0) {
 			int i = 0;
 			ReferenceBinding aliasTarget = (ReferenceBinding) makeTypeBinding(aliasTargetType);
 			if (aliasTarget.isRawType()) {