[jboss-cvs] JBossAS SVN: r60122 - projects/aop/trunk/aop/src/main/org/jboss/aop/instrument.

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

Author: flavia.rainone at jboss.com
Date: 2007-01-30 14:53:58 -0500 (Tue, 30 Jan 2007)
New Revision: 60122

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodExecutionTransformer.java
Log:
[JBAOP-353] Bug solved (method execution transformer didn't verify if the method was advisable before instrumenting it)

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodExecutionTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodExecutionTransformer.java	2007-01-30 17:49:18 UTC (rev 60121)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodExecutionTransformer.java	2007-01-30 19:53:58 UTC (rev 60122)
@@ -25,9 +25,6 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
-import org.jboss.aop.ClassAdvisor;
-import org.jboss.aop.classpool.AOPClassPool;
-import org.jboss.aop.util.JavassistMethodHashing;
 
 import javassist.CannotCompileException;
 import javassist.CtClass;
@@ -40,6 +37,11 @@
 import javassist.bytecode.ParameterAnnotationsAttribute;
 import javassist.bytecode.annotation.Annotation;
 
+import org.jboss.aop.ClassAdvisor;
+import org.jboss.aop.classpool.AOPClassPool;
+import org.jboss.aop.util.Advisable;
+import org.jboss.aop.util.JavassistMethodHashing;
+
 /**
  * Comment
  *
@@ -119,6 +121,10 @@
       CtMethod[] methods = clazz.getDeclaredMethods();
       for (int i = 0; i < methods.length; i++)
       {
+         if (!Advisable.isAdvisable(methods[i]))
+         {
+            continue;
+         }
          JoinpointClassification classification = classifier.classifyMethodExecution(methods[i], advisor);
          if (classification == JoinpointClassification.NOT_INSTRUMENTED)
          {