From 82da6700027abcd575e4a372e1d55e841f17e89f Mon Sep 17 00:00:00 2001 From: Uri Simchoni Date: Mon, 5 Feb 2024 08:29:32 +0200 Subject: [PATCH] Remove WeavingAdaptor.couldWeave() WeavingAdaptor.couldWeave() tested two things: whether this specific class (by its name) should be excluded from weaving, and whether the class has generated classes associated with it (in which case we avoid weaving to avoid re-creating those generated classes). However, if the class has generated classes associated, couldWeave() is not called at all because of the new wovenWithGeneratedClass() test, so we have only the name test which is now called directly. Relates to #279. --- .../java/org/aspectj/weaver/tools/WeavingAdaptor.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java b/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java index 551ef45e6..966143fc1 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java @@ -369,7 +369,7 @@ public class WeavingAdaptor implements IMessageContext { try { delegateForCurrentClass = null; - if (couldWeave(name, bytes)) { + if (shouldWeaveName(name)) { if (accept(name, bytes)) { // Determine if we have the weaved class cached @@ -448,14 +448,6 @@ public class WeavingAdaptor implements IMessageContext { } } - /** - * @param name - * @return true if even valid to weave: either with an accept check or to munge it for @AspectJ aspectof support - */ - private boolean couldWeave(String name, byte[] bytes) { - return !generatedClasses.containsKey(name) && shouldWeaveName(name); - } - /** * Return the bytes from a (parallel?) weaving process that generated an inner class, e.g. to support Around closures. * This is done instead of weaving again, as weaving would generate another inner class. -- 2.39.5