166647 fixes: produces a suitable error if XML defined aspects are excluded from...

diff --git a/loadtime/src/org/aspectj/weaver/loadtime/Aj.java b/loadtime/src/org/aspectj/weaver/loadtime/Aj.java
index 30106ca3e6d8f42f86cc168ae3a9738e25ef06a0..b810a9078dd2e25b558971725db97166884c643f 100644 (file)
--- a/loadtime/src/org/aspectj/weaver/loadtime/Aj.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/Aj.java
@@ -75,7 +75,7 @@ public class Aj implements ClassPreProcessor {
                        if (trace.isTraceEnabled()) trace.exit("preProcess");
                        return bytes;
                 }
-                byte[] newBytes = weavingAdaptor.weaveClass(className, bytes);
+                byte[] newBytes = weavingAdaptor.weaveClass(className, bytes,false);
                 Dump.dumpOnExit(weavingAdaptor.getMessageHolder(), true);
                        if (trace.isTraceEnabled()) trace.exit("preProcess",newBytes);
                 return newBytes;

diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
index 6aa2043930a6efb73a2436c184400689687f499d..3044762940d6346954e6ad623f702fafd5998b56 100644 (file)
--- a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
@@ -468,7 +468,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
                byte[] bytes = gen.getBytes();
 
                try {
-                       byte[] newBytes = weaveClass(name, bytes);
+                       byte[] newBytes = weaveClass(name, bytes,true);
                 this.generatedClassHandler.acceptClass(name,newBytes);
                }
                catch (IOException ex) {

diff --git a/loadtime/src/org/aspectj/weaver/loadtime/WeavingURLClassLoader.java b/loadtime/src/org/aspectj/weaver/loadtime/WeavingURLClassLoader.java
index fca4a23a56d72f27693aca303c4236a90cb24b10..01d3c6d9098fff723fcbb74c59fd3f399f3bf6e7 100644 (file)
--- a/loadtime/src/org/aspectj/weaver/loadtime/WeavingURLClassLoader.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/WeavingURLClassLoader.java
@@ -125,7 +125,7 @@ public class WeavingURLClassLoader extends ExtensibleURLClassLoader implements W
                        }
                        
                        try {
-                               b = adaptor.weaveClass(name,b);
+                               b = adaptor.weaveClass(name,b,false);
                        }
                        catch (AbortException ex) {
                        trace.error("defineClass",ex);