don't re-resolve already resolved types

diff --git a/weaver/src/org/aspectj/weaver/World.java b/weaver/src/org/aspectj/weaver/World.java
index 4efa5fe657d17744d752707873e1c7630c3fdcdd..c32066db00b01014fb93c3bc323319e76d7150cb 100644 (file)
--- a/weaver/src/org/aspectj/weaver/World.java
+++ b/weaver/src/org/aspectj/weaver/World.java
@@ -156,6 +156,11 @@ public abstract class World implements Dump.INode {
     }
 
     public ResolvedTypeX resolve(TypeX ty, boolean allowMissing) {
+       if (ty instanceof ResolvedTypeX) {
+               ResolvedTypeX rty = (ResolvedTypeX) ty;
+               rty.world = this; 
+               return rty;
+       }
        //System.out.println("resolve: " + ty + " world " + typeMap.keySet());          
        if (ty instanceof UnresolvedTypeVariableReferenceType) {
                // AMC - don't like this instanceof test, suggests some refactoring needed...