diff options
| author | aclement <aclement> | 2007-12-04 09:40:26 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2007-12-04 09:40:26 +0000 |
| commit | f07ca5ac11808f354f7f4daffcd035300128e7d6 (patch) | |
| tree | 95028099e032756b58a30aa3aa8b3ebf64f39471 /loadtime/src | |
| parent | 4e7583aac32c77523a357f9606be6fd29ec62a6f (diff) | |
| download | aspectj-f07ca5ac11808f354f7f4daffcd035300128e7d6.tar.gz aspectj-f07ca5ac11808f354f7f4daffcd035300128e7d6.zip | |
166647 fixes: produces a suitable error if XML defined aspects are excluded from weaving
Diffstat (limited to 'loadtime/src')
3 files changed, 3 insertions, 3 deletions
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/Aj.java b/loadtime/src/org/aspectj/weaver/loadtime/Aj.java index 30106ca3e..b810a9078 100644 --- 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 6aa204393..304476294 100644 --- 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 fca4a23a5..01d3c6d90 100644 --- 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); |