317139: guard on NPE

1 files changed, 7 insertions, 4 deletions

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java b/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java
index 8f1826c1b..a78aab81d 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java
@@ -819,10 +819,13 @@ public class BcelObjectType extends AbstractReferenceTypeDelegate {
 		if (isGeneric()) {
 			// update resolved typex to point at generic type not raw type.
 			ReferenceType genericType = (ReferenceType) this.resolvedTypeX.getGenericType();
-			// genericType.setSourceContext(this.resolvedTypeX.getSourceContext()
-			// );
-			genericType.setStartPos(this.resolvedTypeX.getStartPos());
-			this.resolvedTypeX = genericType;
+			// genericType.setSourceContext(this.resolvedTypeX.getSourceContext());
+			// Can be null if unpacking whilst building the bcel delegate (in call hierarchy from BcelWorld.addSourceObjectType()
+			// line 453) - see 317139
+			if (genericType != null) {
+				genericType.setStartPos(this.resolvedTypeX.getStartPos());
+				this.resolvedTypeX = genericType;
+			}
 		}
 	}