Some updates for 118754. The various places that were checking for 'MISSING' now call 'isMissing' if they can. I think this negates some work Adrian did with introducing MissingWithKnownSignature - but we have to make this change for LTW to work properly. Someone with a bit of time on their hands should go through all the places isMissing() is now called and see if the check should be 'isReallyMissing()' which would allow the MissingWithKnownSignature to get through. I will raise an enhancement to cover this.

1 files changed, 2 insertions, 2 deletions

diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java b/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java
index 897e17f52..ff1ea65cf 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java
@@ -125,7 +125,7 @@ public class ConcreteAspectCodeGen {
 
         m_parent = m_world.resolve(m_concreteAspect.extend, true);
         // handle inner classes
-        if (m_parent.equals(ResolvedType.MISSING)) {
+        if (m_parent.isMissing()) {
             // fallback on inner class lookup mechanism
             String fixedName = m_concreteAspect.extend;
             int hasDot = fixedName.lastIndexOf('.');
@@ -135,7 +135,7 @@ public class ConcreteAspectCodeGen {
                 fixedName = new String(fixedNameChars);
                 hasDot = fixedName.lastIndexOf('.');
                 m_parent = m_world.resolve(UnresolvedType.forName(fixedName), true);
-                if (!m_parent.equals(ResolvedType.MISSING)) {
+                if (!m_parent.isMissing()) {
                     break;
                 }
             }