From 6d6738cfece6328027916681e67e54225531db38 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Fri, 16 Dec 2016 17:23:41 -0800 Subject: 509327: extended the test slightly --- .../aspectj/weaver/reflect/JavaLangTypeToResolvedTypeConverter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'weaver5/java5-src/org') 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 -- cgit v1.2.3