Fix for 139936 "[ltw] WeavingAdaptor.generatedClassesExist() cannot cope with additional class weaving"

1 files changed, 9 insertions, 2 deletions

diff --git a/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java b/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
index 29f6f0e37..67fb699b0 100644
--- a/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
+++ b/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
@@ -215,6 +215,9 @@ public class WeavingAdaptor {
 	            info("weaving '" + name + "'");
 	            bytes = getAtAspectJAspectBytes(name, bytes);
 	        }
+			else {
+				info("not weaving '" + name + "'");
+			}
 		}
 
         return bytes;
@@ -245,12 +248,14 @@ public class WeavingAdaptor {
     }
 
 	private boolean shouldWeaveName (String name) {
-		return !((/*(name.startsWith("org.apache.bcel.")//FIXME AV why ? bcel is wrapped in org.aspectj.
+		boolean should =
+		       !((/*(name.startsWith("org.apache.bcel.")//FIXME AV why ? bcel is wrapped in org.aspectj.
                 ||*/ name.startsWith("org.aspectj.")
                 || name.startsWith("java.")
                 || name.startsWith("javax."))
                 //|| name.startsWith("$Proxy")//JDK proxies//FIXME AV is that 1.3 proxy ? fe. ataspect.$Proxy0 is a java5 proxy...
                 || name.startsWith("sun.reflect."));//JDK reflect
+		return should;
 	}
 
     /**
@@ -507,7 +512,9 @@ public class WeavingAdaptor {
 					/* Classes generated by weaver e.g. around closure advice */
 					else {
 						String className = result.getClassName();
+						System.err.println("? WeavingClassFileProvider.acceptResult() " + wovenClass.getClassName() + "->" + className);
 						generatedClasses.put(className,result);
+						generatedClasses.put(wovenClass.getClassName(),result);
 						generatedClassHandler.acceptClass(className,result.getBytes());
 					}
 				}
@@ -527,4 +534,4 @@ public class WeavingAdaptor {
 			};				
 		}
 	}
-}
+}
\ No newline at end of file