ltw reweavable test for Mattew bug, fix some wrong getCoreType that makes some stderr output when closure are encountered on ltw / dump

1 files changed, 3 insertions, 3 deletions

diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
index ee0783088..f018c0131 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
@@ -250,7 +250,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
             return true;
         }
         //TODO AV - optimize for className.startWith only
-        ResolvedType classInfo = weaver.getWorld().getCoreType(UnresolvedType.forName(className));
+        ResolvedType classInfo = weaver.getWorld().resolve(UnresolvedType.forName(className), true);
         //exclude
         for (Iterator iterator = m_excludeTypePattern.iterator(); iterator.hasNext();) {
             TypePattern typePattern = (TypePattern) iterator.next();
@@ -275,7 +275,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
             return true;
         }
         //TODO AV - optimize for className.startWith only
-        ResolvedType classInfo = weaver.getWorld().getCoreType(UnresolvedType.forName(aspectClassName));
+        ResolvedType classInfo = weaver.getWorld().resolve(UnresolvedType.forName(aspectClassName), true);
         //exclude
         for (Iterator iterator = m_aspectExcludeTypePattern.iterator(); iterator.hasNext();) {
             TypePattern typePattern = (TypePattern) iterator.next();
@@ -293,7 +293,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
             return false;
         }
         //TODO AV - optimize for className.startWith only
-        ResolvedType classInfo = weaver.getWorld().getCoreType(UnresolvedType.forName(className));
+        ResolvedType classInfo = weaver.getWorld().resolve(UnresolvedType.forName(className), true);
         //dump
         for (Iterator iterator = m_dumpTypePattern.iterator(); iterator.hasNext();) {
             TypePattern typePattern = (TypePattern) iterator.next();