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

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

Author: stalep
Date: 2008-02-18 08:57:13 -0500 (Mon, 18 Feb 2008)
New Revision: 69881

Modified:
   projects/aop/trunk/aop/base-tests.xml
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java
Log:
[JBAOP-528] Added check for _getInstanceAdvisor too

Modified: projects/aop/trunk/aop/base-tests.xml
===================================================================
--- projects/aop/trunk/aop/base-tests.xml	2008-02-18 13:35:09 UTC (rev 69880)
+++ projects/aop/trunk/aop/base-tests.xml	2008-02-18 13:57:13 UTC (rev 69881)
@@ -85,14 +85,24 @@
       <antcall target="${test-target}" inheritRefs="true">
          <param name="test" value="bridgemethod"/>
       </antcall>
+      <antcall target="${test-target}" inheritRefs="true">
+         <param name="test" value="duplicatemethod"/>
+      </antcall>
       <!--
       <antcall target="${test-target}" inheritRefs="true">
          <param name="test" value="rebuildingchain"/>
       </antcall>
       -->
       <antcall target="${test-target}" inheritRefs="true">
+         <param name="test" value="rebuildcallerchain"/>
+      </antcall>
+
+      <antcall target="${test-target}" inheritRefs="true">
          <param name="test" value="array"/>
       </antcall>
+      <antcall target="${test-target}" inheritRefs="true">
+         <param name="test" value="annotatedgenericinterface"/>
+      </antcall>
 
       <!-- Tests with special requirements for parameters -->
       <antcall target="${test-target}" inheritRefs="true">

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java	2008-02-18 13:35:09 UTC (rev 69880)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java	2008-02-18 13:57:13 UTC (rev 69881)
@@ -188,7 +188,8 @@
       CtMethod[] methods = clazz.getDeclaredMethods();
       for(int i=0; i < methods.length;i++)
       {
-         if(methods[i].getName().equals("_getAdvisor"))
+         if(methods[i].getName().equals("_getAdvisor") ||
+               methods[i].getName().equals("_getInstanceAdvisor"))
             clazz.removeMethod(methods[i]);
       }
    }