aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2008-03-24 19:48:28 +0000
committeraclement <aclement>2008-03-24 19:48:28 +0000
commit3dbf9fd5823d04e3ef6b9b39e5ebec62dd3aed35 (patch)
tree40e4d11c7267d485e8d2e8fa8b53048a1d443d86
parent659bd1bd5a03eb975f5bdd2a2c6687d16bf4abca (diff)
downloadaspectj-3dbf9fd5823d04e3ef6b9b39e5ebec62dd3aed35.tar.gz
aspectj-3dbf9fd5823d04e3ef6b9b39e5ebec62dd3aed35.zip
214994: generic itds alias NPE: tests and fix
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java3
1 files changed, 3 insertions, 0 deletions
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 a87a10f16..fd54e9850 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
@@ -845,6 +845,9 @@ public class EclipseFactory {
if (aliases!=null && aliases.size()!=0) {
int i=0;
ReferenceBinding aliasTarget = (ReferenceBinding)makeTypeBinding(aliasTargetType);
+ if (aliasTarget.isRawType()) {
+ aliasTarget = ((RawTypeBinding) aliasTarget).genericType();
+ }
for (Iterator iter = aliases.iterator(); iter.hasNext();) {
String element = (String) iter.next();
typeVariableToTypeBinding.put(element,aliasTarget.typeVariables()[i++]);