null guards

2 files changed, 8 insertions, 6 deletions

diff --git a/weaver/src/org/aspectj/weaver/ArrayReferenceType.java b/weaver/src/org/aspectj/weaver/ArrayReferenceType.java
index 1b42e4875..76e9ba122 100644
--- a/weaver/src/org/aspectj/weaver/ArrayReferenceType.java
+++ b/weaver/src/org/aspectj/weaver/ArrayReferenceType.java
@@ -107,7 +107,7 @@ public class ArrayReferenceType extends ReferenceType {
     // Methods overridden from ReferenceType follow
 
     public TypeVariable[] getTypeVariables() {
-        if (this.typeVariables == null) {
+        if (this.typeVariables == null && componentType.getTypeVariables() != null) {
             this.typeVariables = componentType.getTypeVariables();
             for (int i = 0; i < this.typeVariables.length; i++) {
                 this.typeVariables[i].resolve(world);
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.java b/weaver/src/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.java
index 082dccfdc..e6f8829bf 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.java
@@ -255,11 +255,13 @@ public class BcelGenericSignatureToTypeXConverter {
 		
 		ReferenceType rt = (ReferenceType) aTypeX;
 		TypeVariable[] typeVars = rt.getTypeVariables();
-		for (int i = 0; i < typeVars.length; i++) {
-			if (typeVars[i].getUpperBound() instanceof FTPHolder) {
-				Signature.FormalTypeParameter key = ((FTPHolder) typeVars[i].getUpperBound()).ftpToBeSubstituted;
-				typeVars[i].setUpperBound((UnresolvedType)typeVariableResolutions.get(key));
-			}
+		if (typeVars != null) {
+            for (int i = 0; i < typeVars.length; i++) {
+                if (typeVars[i].getUpperBound() instanceof FTPHolder) {
+                    Signature.FormalTypeParameter key = ((FTPHolder) typeVars[i].getUpperBound()).ftpToBeSubstituted;
+                    typeVars[i].setUpperBound((UnresolvedType) typeVariableResolutions.get(key));
+                }
+            }
 		}
 	}