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

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

Author: kabir.khan at jboss.com
Date: 2007-06-26 11:30:10 -0400 (Tue, 26 Jun 2007)
New Revision: 63642

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
Log:
[JBAOP-376] Remove "super.info.getInterceptors() check from generated invokeJoinpoint() method. If the generated joinpoint is being called, that means there are some interceptors

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	2007-06-26 15:28:15 UTC (rev 63641)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java	2007-06-26 15:30:10 UTC (rev 63642)
@@ -811,10 +811,7 @@
                cflows.append(", cflow" + asetups[i].getIndex());
             }
          }
-         code.append(joinpointFqn).append(" jp = null;");
-         code.append("      if(" + INFO_FIELD + ".getInterceptors() != null)");
-         code.append("      {");
-         code.append("         jp = new " + joinpointClass.getName() + "(this");
+         code.append(joinpointFqn).append(" jp = new " + joinpointClass.getName() + "(this");
          if (argsFoundBefore)
          {
             parameters.appendParameterListWithoutArgs(code);
@@ -840,14 +837,6 @@
          }
          code.append("jp.invokeNext();");
          
-         code.append("      }");
-         code.append("      else");
-         code.append("      {");
-         
-         addDispatchCode(code, parameterTypes, argsFoundBefore);
-         
-         code.append("      }");
-         
          // 'after' code will find all args inconsistent, since we have to update
          // arguments array according to invocation values
          inconsistentTypeArgs.get().addAll(joinPointArguments);