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

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

Author: flavia.rainone at jboss.com
Date: 2008-04-26 00:57:20 -0400 (Sat, 26 Apr 2008)
New Revision: 72748

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java
Log:
[JBAOP-545] An optimization: replaced isBaseClass calls by checks on superClassAdvisor nullity.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java	2008-04-26 03:25:05 UTC (rev 72747)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java	2008-04-26 04:57:20 UTC (rev 72748)
@@ -238,7 +238,8 @@
             INITIALISE_METHODS,
             EMPTY_SIG,
             EMPTY_EXCEPTIONS,
-            (isBaseClass(clazz)) ?
+            // isBaseClass?
+            (superAdvisor == null) ?
                   null : "{super." + INITIALISE_METHODS + "();}",
             genadvisor);
       genadvisor.addMethod(initialiseMethods);
@@ -263,7 +264,8 @@
             INITIALISE_CONSTRUCTIONS,
             superInitialiseConstructions.getParameterTypes(),
             EMPTY_EXCEPTIONS,
-            (isBaseClass(clazz)) ?
+            // isBaseClass?
+            (superAdvisor == null) ?
                   null : "{super." + INITIALISE_CONSTRUCTIONS + "($1);}",
             genadvisor);
       genadvisor.addMethod(initialiseConstructions);
@@ -276,7 +278,8 @@
             INITIALISE_FIELD_READS,
             superInitialiseFieldReads.getParameterTypes(),
             EMPTY_EXCEPTIONS,
-            (isBaseClass(clazz)) ?
+            // isBaseClass?
+            (superAdvisor == null) ?
                   null : "{super." + INITIALISE_FIELD_READS + "($1);}",
             genadvisor);
       genadvisor.addMethod(initialiseFieldReads);
@@ -289,7 +292,8 @@
             INITIALISE_FIELD_WRITES,
             superInitialiseFieldWrites.getParameterTypes(),
             EMPTY_EXCEPTIONS,
-            (isBaseClass(clazz)) ?
+            // isBaseClass?
+            (superAdvisor == null) ?
                   null : "{super." + INITIALISE_FIELD_WRITES + "($1);}",
             genadvisor);
       genadvisor.addMethod(initialiseFieldWrites);
@@ -300,7 +304,8 @@
             INITIALISE_CALLERS,
             EMPTY_SIG,
             EMPTY_EXCEPTIONS,
-            (isBaseClass(clazz)) ?
+            // isBaseClass?
+            (superAdvisor == null) ?
                   null : "{super." + INITIALISE_CALLERS + "();}",
             genadvisor);
       genadvisor.addMethod(initialiseCallers);