*/
private void registerAspects(final BcelWeaver weaver, final ClassLoader loader, final List definitions) {
if (trace.isTraceEnabled()) trace.enter("registerAspects",this, new Object[] { weaver, loader, definitions} );
+ boolean success = true;
+
//TODO: the exclude aspect allow to exclude aspect defined upper in the CL hierarchy - is it what we want ??
// if not, review the getResource so that we track which resource is defined by which CL
ConcreteAspectCodeGen gen = new ConcreteAspectCodeGen(concreteAspect, weaver.getWorld());
if (!gen.validate()) {
error("Concrete-aspect '"+concreteAspect.name+"' could not be registered");
+ success = false;
break;
}
this.generatedClassHandler.acceptClass(
}
// System.out.println("ClassLoaderWeavingAdaptor.registerAspects() classloader=" + weavingContext.getClassLoaderName() + ", namespace=" + namespace);
+ /* We couldn't register one or more aspects so disable the adaptor */
+ if (!success) {
+ disable();
+ warn("failure(s) registering aspects. Disabling weaver for class loader " + getClassLoaderName(loader));
+ }
+
/* We didn't register any aspects so disable the adaptor */
- if (namespace == null) {
+ else if (namespace == null) {
disable();
info("no aspects registered. Disabling weaver for class loader " + getClassLoaderName(loader));
}
import java.util.Map;
import java.util.StringTokenizer;
+import org.aspectj.bridge.AbortException;
import org.aspectj.weaver.ExtensibleURLClassLoader;
+import org.aspectj.weaver.tools.Trace;
+import org.aspectj.weaver.tools.TraceFactory;
import org.aspectj.weaver.tools.WeavingAdaptor;
import org.aspectj.weaver.tools.WeavingClassLoader;
private WeavingAdaptor adaptor;
private boolean initializingAdaptor;
private Map generatedClasses = new HashMap(); /* String -> byte[] */
+
+ private static Trace trace = TraceFactory.getTraceFactory().getTrace(WeavingURLClassLoader.class);
/*
* This constructor is needed when using "-Djava.system.class.loader".
public WeavingURLClassLoader (URL[] urls, ClassLoader parent) {
super(urls,parent);
+ if (trace.isTraceEnabled()) trace.enter("<init>",this,new Object[] { urls, parent });
// System.out.println("WeavingURLClassLoader.WeavingURLClassLoader()");
+ if (trace.isTraceEnabled()) trace.exit("<init>");
}
public WeavingURLClassLoader (URL[] classURLs, URL[] aspectURLs, ClassLoader parent) {
* Override to weave class using WeavingAdaptor
*/
protected Class defineClass(String name, byte[] b, CodeSource cs) throws IOException {
+ if (trace.isTraceEnabled()) trace.enter("defineClass",this,new Object[] { name, b, cs });
// System.err.println("? WeavingURLClassLoader.defineClass(" + name + ", [" + b.length + "])");
/* Avoid recursion during adaptor initialization */
createAdaptor();
}
- b = adaptor.weaveClass(name,b);
+ try {
+ b = adaptor.weaveClass(name,b);
+ }
+ catch (AbortException ex) {
+ trace.error("defineClass",ex);
+ throw ex;
+ }
+ catch (Throwable th) {
+ trace.error("defineClass",th);
+ }
}
- return super.defineClass(name, b, cs);
+ Class clazz = super.defineClass(name, b, cs);
+ if (trace.isTraceEnabled()) trace.exit("defineClass",clazz);
+ return clazz;
}
private void createAdaptor () {
--- /dev/null
+<aspectj>
+ <aspects>
+ <aspect name="EmptyAspect"/>
+ </aspects>
+</aspectj>
\ No newline at end of file
--- /dev/null
+public aspect EmptyAspect {
+
+}
\ No newline at end of file
<run class="HelloWorld" ltw="aop-tracing.xml">
<stderr>
<line text="error Abstract method 'void ConcreteMethods.foo(int)' cannot be concretized in XML:"/>
- <line text="warning register definition failed"/>
+ <line text="error Concrete-aspect 'TraceHelloWorld' could not be registered"/>
+ <line text="warning failure(s) registering aspects. Disabling weaver for class loader"/>
</stderr>
<stdout>
<line text="Hello World!"/>
<run class="HelloWorld" ltw="aop-tracing.xml">
<stderr>
<line text="error Abstract method 'void AbstractMethods.test()' cannot be concretized in XML"/>
- <line text="warning register definition failed"/>
+ <line text="error Concrete-aspect 'TraceHelloWorld' could not be registered"/>
+ <line text="warning failure(s) registering aspects. Disabling weaver for class loader"/>
</stderr>
<stdout>
<line text="Hello World!"/>
public void testDuplicateJVMTIAgents_pr151938() {runTest("Duplicate JVMTI agents");};
public void testLTWWorldWithAnnotationMatching_pr153572() { runTest("LTWWorld with annotation matching");}
+ public void testReweavableAspectNotRegistered_pr129525 () {
+ runTest("reweavableAspectNotRegistered error");
+ }
+
/////////////////////////////////////////
public static Test suite() {
return XMLBasedAjcTestCase.loadSuite(Ajc153Tests.class);
</run>
</ajc-test>
+ <ajc-test dir="ltw" title="reweavableAspectNotRegistered error">
+ <compile files="HelloWorld.java, ExceptionHandler.aj" options="-showWeaveInfo">
+ <message kind="weave" text="Join point 'method-execution(void HelloWorld.main(java.lang.String[]))' in Type 'HelloWorld' (HelloWorld.java:3) advised by around advice from 'ExceptionHandler' (ExceptionHandler.aj:2)"/>
+ </compile>
+ <compile files="EmptyAspect.aj">
+ </compile>
+ <run class="HelloWorld" ltw="aop-missingaspect.xml">
+ <stdout>
+ <line text="Hello World!"/>
+ </stdout>
+ <stderr>
+ <line text="error aspect 'ExceptionHandler' woven into 'HelloWorld' must be defined to the weaver (placed on the aspectpath, or defined in an aop.xml file if using LTW)."/>
+ </stderr>
+ </run>
+ </ajc-test>
+
</suite>
\ No newline at end of file
<line text="warning aspect ExcludedAspect exluded"/>
<line text="error Cannot find m_parent aspect"/>
<line text="error Cannot find m_parent aspect"/>
- <line text="warning register definition failed"/>
- <line text="warning register definition failed"/>
+ <line text="error Concrete-aspect 'IncludedMissingAspect' could not be registered"/>
+ <line text="error Concrete-aspect 'IncludedMissingAspect' could not be registered"/>
+ <line text="warning failure(s) registering aspects. Disabling weaver for class loader"/>
+ <line text="warning failure(s) registering aspects. Disabling weaver for class loader"/>
</stderr>
</ant>
</ajc-test>
protected BcelWeaver weaver;
private IMessageHandler messageHandler;
private WeavingAdaptorMessageHandler messageHolder;
+ private boolean abortOnError = false;
protected GeneratedClassHandler generatedClassHandler;
protected Map generatedClasses = new HashMap(); /* String -> UnwovenClassFile */
protected BcelObjectType delegateForCurrentClass; // lazily initialized, should be used to prevent parsing bytecode multiple times
}
private void init(List classPath, List aspectPath) {
+ abortOnError = true;
createMessageHandler();
info("using classpath: " + classPath);
}
protected void disable () {
+ if (trace.isTraceEnabled()) trace.enter("disable",this);
+
enabled = false;
messageHolder.flushMessages();
+
+ if (trace.isTraceEnabled()) trace.exit("disable");
}
protected boolean isEnabled () {
if (traceMessages) traceMessage(message);
if (accumulating) {
boolean result = addMessage(message);
- if (0 <= message.getKind().compareTo(IMessage.ERROR)) {
+ if (abortOnError && 0 <= message.getKind().compareTo(IMessage.ERROR)) {
throw new AbortException(message);
}
return result;
public boolean handleMessage(IMessage message) throws AbortException {
boolean result = super.handleMessage(message);
- if (0 <= message.getKind().compareTo(failKind)) {
+ if (abortOnError && 0 <= message.getKind().compareTo(failKind)) {
throw new AbortException(message);
}
return true;
projects / aspectj.git / commitdiff