remember source location when faulting in generic type

1 files changed, 4 insertions, 1 deletions

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java b/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java
index 575480e94..285f2c52c 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java
@@ -533,7 +533,10 @@ public class BcelObjectType extends AbstractReferenceTypeDelegate {
 		}
 		if (isGeneric()) {
 			// update resolved typex to point at generic type not raw type.
-			this.resolvedTypeX = (ReferenceType) this.resolvedTypeX.getGenericType();
+			ReferenceType genericType = (ReferenceType) this.resolvedTypeX.getGenericType();
+			genericType.setSourceContext(this.resolvedTypeX.getSourceContext());
+			genericType.setStartPos(this.resolvedTypeX.getStartPos());
+			this.resolvedTypeX = genericType;
 		}
 	}