diff options
| author | Andy Clement <aclement@pivotal.io> | 2017-11-09 13:14:02 -0800 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2017-11-09 13:14:02 -0800 |
| commit | d92319c43f5723d57887e09f2a839ee5b595fcfd (patch) | |
| tree | 155e25d455e598ff5b55b0563645d4af23903bb4 /org.aspectj.matcher | |
| parent | 6765fdc34c775e99799b36d88cff8ab88dffc8e7 (diff) | |
| download | aspectj-d92319c43f5723d57887e09f2a839ee5b595fcfd.tar.gz aspectj-d92319c43f5723d57887e09f2a839ee5b595fcfd.zip | |
Updates to better cope with future JDKs
The version handling in LangUtil has been overhauled
to cope better with post 1.8 releases (JDK9 and JDK10 or 18.3
or whatever they call it). As part of this moved
to treating JDK9 as '9' rather than '1.9'. Also removed
duplicate version processing logic and had that defer to
the one place in LangUtil where we now deal with it.
Includes some generics tidyup in ajdoc. More ajdoc work
is necessary for Java10 because it removes the standard doclet
(old style). However trying to invoke the internal Javadoc
handler in Java10 is failing due to module visibility rules.
Diffstat (limited to 'org.aspectj.matcher')
| -rw-r--r-- | org.aspectj.matcher/src/org/aspectj/weaver/World.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/World.java b/org.aspectj.matcher/src/org/aspectj/weaver/World.java index 8af6cc528..99f1e5e11 100644 --- a/org.aspectj.matcher/src/org/aspectj/weaver/World.java +++ b/org.aspectj.matcher/src/org/aspectj/weaver/World.java @@ -462,6 +462,9 @@ public abstract class World implements Dump.INode { } else if (ty.isGenericType()) { // ======= generic types ====================== ResolvedType rt = resolveGenericTypeFor(ty, false); + if (rt.isMissing()) { + return rt; + } ReferenceType genericType = (ReferenceType) rt; return genericType; |