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

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

Author: kabir.khan at jboss.com
Date: 2006-11-24 08:15:39 -0500 (Fri, 24 Nov 2006)
New Revision: 58668

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
Log:
Reinstantiate the parameter-less generateJoinPointClass() method which will default to use the TCL, since that is needed for POJO Cache

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	2006-11-24 13:06:07 UTC (rev 58667)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java	2006-11-24 13:15:39 UTC (rev 58668)
@@ -144,7 +144,16 @@
       
    /**
     * Called by the joinpoint if a interceptors were regenereated
+    * Here for backwards compatiblity with AOP 1.5.0
     */
+   public void generateJoinPointClass()
+   {
+      generateJoinPointClass(null);
+   }
+   
+   /**
+    * Called by the joinpoint if a interceptors were regenereated
+    */
    public synchronized void generateJoinPointClass(ClassLoader classloader)
    {
       if (System.getSecurityManager() == null)
@@ -165,11 +174,11 @@
    {
       try
       {
-         if (joinpointField.get(advisor) != null)
+         if (classloader  == null)
          {
-            //someone beat us to generating the class
-            return;
+            classloader = Thread.currentThread().getContextClassLoader();
          }
+
          AspectManager manager = AspectManager.instance();
          //ClassPool pool = manager.findClassPool(Thread.currentThread().getContextClassLoader());
          ClassPool pool = manager.findClassPool(classloader);