From: Andy Clement <aclement@pivotal.io>
Date: Thu, 1 Feb 2018 01:21:15 +0000 (-0800)
Subject: merged
X-Git-Tag: V1_9_0_RC3~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d6378eeec8c1928462f8561d23fafda5012b790c;p=aspectj.git

merged
---

d6378eeec8c1928462f8561d23fafda5012b790c
diff --cc docs/dist/doc/index.html
index d600c82b7,e174e3c9f..b06c50bc4
--- a/docs/dist/doc/index.html
+++ b/docs/dist/doc/index.html
@@@ -138,7 -138,7 +138,8 @@@
  <tr> <td>README's
       </td>
       <td>Changes and porting guide for AspectJ 
+         <a href="README-190.html">1.9.0</a>,
 +        <a href="README-1811.html">1.8.10</a>,
          <a href="README-1810.html">1.8.10</a>,
          <a href="README-189.html">1.8.9</a>,
          <a href="README-188.html">1.8.8</a>,
diff --cc org.aspectj.matcher/src/org/aspectj/weaver/World.java
index 6bba2d551,99f1e5e11..19d61f5be
--- a/org.aspectj.matcher/src/org/aspectj/weaver/World.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
@@@ -462,10 -462,10 +462,13 @@@ public abstract class World implements 
  		} else if (ty.isGenericType()) {
  			// ======= generic types ======================
  			ResolvedType rt = resolveGenericTypeFor(ty, false);
+ 			if (rt.isMissing()) {
+ 				return rt;
+ 			}
  			ReferenceType genericType = (ReferenceType) rt;
 +			if (rt.isMissing()) {
 +				return rt;
 +			}
  			return genericType;
  
  		} else if (ty.isGenericWildcard()) {