[jboss-cvs] JBossAS SVN: r77732 - in projects/aop/trunk/aop/src/main/org/jboss/aop: standalone and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: flavia.rainone at jboss.com
Date: 2008-08-31 22:36:45 -0400 (Sun, 31 Aug 2008)
New Revision: 77732

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java
Log:
[JBAOP-631] The generated joinpoint class name common prefix has been added to the list of non-advised
class prefix names of AOPTransformer and AspectManager isNonAdvisableClassName methods.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java	2008-09-01 02:06:37 UTC (rev 77731)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java	2008-09-01 02:36:45 UTC (rev 77732)
@@ -63,6 +63,7 @@
 import org.jboss.aop.instrument.GeneratedAdvisorInstrumentor;
 import org.jboss.aop.instrument.Instrumentor;
 import org.jboss.aop.instrument.InstrumentorFactory;
+import org.jboss.aop.instrument.JoinPointGenerator;
 import org.jboss.aop.instrument.TransformerCommon;
 import org.jboss.aop.introduction.AnnotationIntroduction;
 import org.jboss.aop.introduction.InterfaceIntroduction;
@@ -927,6 +928,7 @@
               classname.startsWith("org.jboss.util.") ||
               classname.startsWith("gnu.trove.") ||
               classname.startsWith("EDU.oswego.cs.dl.util.concurrent.") ||
+              classname.startsWith(JoinPointGenerator.JOINPOINT_CLASS_PREFIX) ||
       // System classes
               classname.startsWith("org.apache.tools.ant") ||
               classname.startsWith("org.apache.crimson") ||

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java	2008-09-01 02:06:37 UTC (rev 77731)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java	2008-09-01 02:36:45 UTC (rev 77732)
@@ -21,12 +21,13 @@
   */
 package org.jboss.aop.standalone;
 
-import org.jboss.aop.AspectManager;
-
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.IllegalClassFormatException;
 import java.security.ProtectionDomain;
 
+import org.jboss.aop.AspectManager;
+import org.jboss.aop.instrument.JoinPointGenerator;
+
 /**
  * Comment
  *
@@ -57,7 +58,8 @@
       classname.startsWith("java.") ||
       classname.startsWith("javax.") ||
       classname.startsWith("com.sun.") ||
-      classname.startsWith("$Proxy")
+      classname.startsWith("$Proxy") ||
+      classname.startsWith(JoinPointGenerator.JOINPOINT_CLASS_PREFIX)
       );
    }