diff options
| author | Andy Clement <aclement@pivotal.io> | 2016-12-16 17:23:41 -0800 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2016-12-16 17:23:41 -0800 |
| commit | 6d6738cfece6328027916681e67e54225531db38 (patch) | |
| tree | 5c5b480e7474c4100029126b3faf5de830ab92b4 /weaver5/java5-src/org | |
| parent | 4a07d09f36126bc829204644536ed29b864cef46 (diff) | |
| download | aspectj-6d6738cfece6328027916681e67e54225531db38.tar.gz aspectj-6d6738cfece6328027916681e67e54225531db38.zip | |
509327: extended the test slightly
Diffstat (limited to 'weaver5/java5-src/org')
| -rw-r--r-- | weaver5/java5-src/org/aspectj/weaver/reflect/JavaLangTypeToResolvedTypeConverter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/weaver5/java5-src/org/aspectj/weaver/reflect/JavaLangTypeToResolvedTypeConverter.java b/weaver5/java5-src/org/aspectj/weaver/reflect/JavaLangTypeToResolvedTypeConverter.java index 41ab968a7..30983e38f 100644 --- a/weaver5/java5-src/org/aspectj/weaver/reflect/JavaLangTypeToResolvedTypeConverter.java +++ b/weaver5/java5-src/org/aspectj/weaver/reflect/JavaLangTypeToResolvedTypeConverter.java @@ -68,11 +68,11 @@ public class JavaLangTypeToResolvedTypeConverter { } else if (type instanceof ParameterizedType) { // https://bugs.eclipse.org/bugs/show_bug.cgi?id=509327 // TODO should deal with the ownerType if it set, indicating this is possibly an inner type of a parameterized type -// Type ownerType = ((ParameterizedType) type).getOwnerType(); + Type ownerType = ((ParameterizedType) type).getOwnerType(); ParameterizedType parameterizedType = (ParameterizedType) type; ResolvedType baseType = fromType(parameterizedType.getRawType()); Type[] typeArguments = parameterizedType.getActualTypeArguments(); - if (baseType.isSimpleType() && typeArguments.length == 0) { + if (baseType.isSimpleType() && typeArguments.length == 0 && ownerType != null) { // 'type' is an inner type of some outer parameterized type // For now just return the base type - in future create the parameterized form of the outer // and use it with the inner. We return the base type to be compatible with what the |