Fix for AjcPre10xTests.test016 if run standalone. (if run standalone no-one was setting the world correctly for certain types and you'd get an NPE).

1 files changed, 4 insertions, 0 deletions

diff --git a/weaver/src/org/aspectj/weaver/ResolvedTypeX.java b/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
index 80ee36f92..1214df7d0 100644
--- a/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
@@ -954,6 +954,10 @@ public abstract class ResolvedTypeX extends TypeX implements AnnotatedElement {
             if (index > 6 || ((Primitive)other).index > 6) return false;
             return true;
         }
+        public ResolvedTypeX resolve(World world) {
+            this.world = world;
+            return super.resolve(world);
+        }
         public final boolean needsNoConversionFrom(TypeX other) {
             if (! other.isPrimitive()) return false;
             return noConvertTable[((Primitive)other).index][index];