246125: c16

diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
index 9bc3dd650a11726b9e82242e0a2a4cccf3e5ef32..f821cb224a38db211b503964511cdc81370ece20 100644 (file)
--- a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
@@ -35,12 +35,12 @@ import org.aspectj.util.LangUtil;
 import org.aspectj.weaver.Lint;
 import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.UnresolvedType;
-import org.aspectj.weaver.WeakClassLoaderReference;
 import org.aspectj.weaver.World;
 import org.aspectj.weaver.Lint.Kind;
 import org.aspectj.weaver.bcel.BcelWeaver;
 import org.aspectj.weaver.bcel.BcelWorld;
 import org.aspectj.weaver.bcel.Utility;
+import org.aspectj.weaver.bcel.BcelWeakClassLoaderReference;
 import org.aspectj.weaver.loadtime.definition.Definition;
 import org.aspectj.weaver.loadtime.definition.DocumentParser;
 import org.aspectj.weaver.ltw.LTWWorld;
@@ -102,10 +102,10 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
        }
 
        class SimpleGeneratedClassHandler implements GeneratedClassHandler {
-               private WeakClassLoaderReference loaderRef;
+               private BcelWeakClassLoaderReference loaderRef;
 
                SimpleGeneratedClassHandler(ClassLoader loader) {
-                       loaderRef = new WeakClassLoaderReference(loader);
+                       loaderRef = new BcelWeakClassLoaderReference(loader);
                }
 
                /**

diff --git a/loadtime/src/org/aspectj/weaver/loadtime/DefaultWeavingContext.java b/loadtime/src/org/aspectj/weaver/loadtime/DefaultWeavingContext.java
index 19feeb393a7764d663304e63baa22e02bea4f7e1..67951c97fc75dcdfc2557260383be47ccfa1c11d 100644 (file)
--- a/loadtime/src/org/aspectj/weaver/loadtime/DefaultWeavingContext.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/DefaultWeavingContext.java
@@ -16,7 +16,7 @@ import java.net.URL;
 import java.util.Enumeration;
 import java.util.List;
 
-import org.aspectj.weaver.WeakClassLoaderReference;
+import org.aspectj.weaver.bcel.BcelWeakClassLoaderReference;
 import org.aspectj.weaver.tools.Trace;
 import org.aspectj.weaver.tools.TraceFactory;
 import org.aspectj.weaver.tools.WeavingAdaptor;
@@ -28,7 +28,7 @@ import org.aspectj.weaver.tools.WeavingAdaptor;
  */
 public class DefaultWeavingContext implements IWeavingContext {
 
-       protected WeakClassLoaderReference loaderRef;
+       protected BcelWeakClassLoaderReference loaderRef;
        private String shortName;
 
        private static Trace trace = TraceFactory.getTraceFactory().getTrace(DefaultWeavingContext.class);
@@ -40,7 +40,7 @@ public class DefaultWeavingContext implements IWeavingContext {
         */
        public DefaultWeavingContext(ClassLoader loader) {
                super();
-               this.loaderRef = new WeakClassLoaderReference(loader);
+               this.loaderRef = new BcelWeakClassLoaderReference(loader);
        }
 
        /**