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

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

Author: flavia.rainone at jboss.com
Date: 2008-03-31 14:20:50 -0400 (Mon, 31 Mar 2008)
New Revision: 71495

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/hook/GenerateInstrumentedClassLoader.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
Log:
[JBAOP-500] Undoing fix. The fix to bug JBAOP-499 solves bug JBAOP-500 as well.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/hook/GenerateInstrumentedClassLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/hook/GenerateInstrumentedClassLoader.java	2008-03-31 18:05:18 UTC (rev 71494)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/hook/GenerateInstrumentedClassLoader.java	2008-03-31 18:20:50 UTC (rev 71495)
@@ -49,7 +49,7 @@
 
       String code = "{"
               + " if (!$1.startsWith(\"org.jboss.aop.\") &&"
-              + " !$1.endsWith(\"$aop\") &&"
+//              + " !$1.endsWith(\"$aop\") &&"
               + " !$1.startsWith(\"javassist\") &&"
               + " !$1.startsWith(\"org.jboss.util.\") &&"
               + " !$1.startsWith(\"gnu.trove.\") &&"

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java	2008-03-31 18:05:18 UTC (rev 71494)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java	2008-03-31 18:20:50 UTC (rev 71495)
@@ -438,7 +438,7 @@
 
    private String getJoinpointClassName()
    {
-      return baseJoinPointClassName + getIncrement() + "$aop";
+      return baseJoinPointClassName + getIncrement();
    }
 
    private void createInitialisePerInstanceAspectsMethod(CtClass clazz, AdviceSetups setups, Class<?> advisedClass) throws CannotCompileException, NotFoundException