From: aclement <aclement>
Date: Thu, 30 Jul 2009 15:29:40 +0000 (+0000)
Subject: 285172: use cached ref type
X-Git-Tag: PRE_J5~26
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dd7d87923f6f8e6ccdc3e387679ba5a3c70550ac;p=aspectj.git

285172: use cached ref type
---

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/World.java b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
index 9e1186904..92666c15e 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/World.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
@@ -285,10 +285,16 @@ public abstract class World implements Dump.INode {
 		}
 
 		// Pulling in the type may have already put the right entry in the map
-		if (typeMap.get(signature) == null && !ret.isMissing()) {
+		ResolvedType result = typeMap.get(signature);
+		if (result == null && !ret.isMissing()) {
 			typeMap.put(signature, ret);
+			return ret;
+		}
+		if (result == null) {
+			return ret;
+		} else {
+			return result;
 		}
-		return ret;
 	}
 
 	/**