test and fix for 158624: generic types and arrays

1 files changed, 4 insertions, 2 deletions

diff --git a/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java b/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java
index f5bd991c7..d1bff9816 100644
--- a/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java
@@ -638,10 +638,11 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Anno
 		}
 		
 		UnresolvedType parameterizedReturnType = parameterize(getGenericReturnType(),typeMap,isParameterized);
-		UnresolvedType[] parameterizedParameterTypes = new UnresolvedType[getGenericParameterTypes().length];
+		UnresolvedType[] parameterizedParameterTypes = new UnresolvedType[getGenericParameterTypes().length];		
+		UnresolvedType[] genericParameterTypes = getGenericParameterTypes(); 
 		for (int i = 0; i < parameterizedParameterTypes.length; i++) {
 			parameterizedParameterTypes[i] = 
-				parameterize(getGenericParameterTypes()[i], typeMap,isParameterized);
+				parameterize(genericParameterTypes[i], typeMap,isParameterized);
 		}
 		ResolvedMemberImpl ret = new ResolvedMemberImpl(
 					getKind(),
@@ -677,6 +678,7 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Anno
 			return (UnresolvedType) typeVariableMap.get(variableName);
 		} else if (aType.isParameterizedType()) {
 			if (inParameterizedType) {
+				if (aType instanceof UnresolvedType) aType= aType.resolve(((ResolvedType)getDeclaringType()).getWorld());
 				return aType.parameterize(typeVariableMap);
 			} else {
 				return aType.getRawType();