[jboss-cvs] JBossAS SVN: r90369 - projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/instrument.

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

Author: flavia.rainone at jboss.com
Date: 2009-06-17 23:15:36 -0400 (Wed, 17 Jun 2009)
New Revision: 90369

Modified:
   projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java
Log:
[JBAOP-736] The suggested fix has been applied to GeneratedAdvisorInstrumentor, whose generated constructors don't rely on Class<?>.getDeclaringClass() anymore.

Modified: projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java	2009-06-18 03:11:39 UTC (rev 90368)
+++ projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java	2009-06-18 03:15:36 UTC (rev 90369)
@@ -79,8 +79,6 @@
    private static final String DO_REBUILD_FOR_INSTANCE = "doRebuildForInstance";
    private static final String LOCK_WRITE_CHAINS = "lockWriteInterceptorChains";
    private static final String UNLOCK_WRITE_CHAINS = "unlockWriteInterceptorChains";
-   
-   private static final String DECLARING_CLASS = "this.getClass().getDeclaringClass()";
 
 
    private static final CtClass[] EMPTY_EXCEPTIONS = new CtClass[0];
@@ -417,12 +415,13 @@
 
    protected void createAdvisorCtors(CtClass clazz)throws CannotCompileException, NotFoundException
    {
+      String declaringClass = clazz.getName() + ".class";
       String initBody =
          "{" +
-         "   java.lang.String domainName = org.jboss.aop.Domain.getDomainName(" + DECLARING_CLASS + ", $2);" + 
-         "   " + DOMAIN + "= new org.jboss.aop.GeneratedAdvisorDomain($1, domainName, " + DECLARING_CLASS + ", $2); " +
+         "   java.lang.String domainName = org.jboss.aop.Domain.getDomainName(" + declaringClass + ", $2);" + 
+         "   " + DOMAIN + "= new org.jboss.aop.GeneratedAdvisorDomain($1, domainName, " + declaringClass + ", $2); " +
          "   ((org.jboss.aop.Domain)" + DOMAIN + ").setInheritsBindings(true); " +
-         "   super.initialise(" + DECLARING_CLASS + ", " + DOMAIN + ");" +
+         "   super.initialise(" + declaringClass + ", " + DOMAIN + ");" +
          "}";
 
          CtMethod initialise = CtNewMethod.make(