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

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

Author: kabir.khan at jboss.com
Date: 2008-06-02 09:54:52 -0400 (Mon, 02 Jun 2008)
New Revision: 73923

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
Log:
[JBAOP-587] Advisors for classes belonging to bootstrap classloader shold be valid

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java	2008-06-02 13:29:51 UTC (rev 73922)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java	2008-06-02 13:54:52 UTC (rev 73923)
@@ -713,16 +713,31 @@
       synchronized (getRegisteredCLs())
       {
          if (!advisors.containsKey(advisor.getClazz())) return false;
-         ScopedClassPool pool = (ScopedClassPool) getRegisteredClassPool(advisor.getClazz().getClassLoader());
-         if (pool == null) return false;
-         if (pool.isUnloadedClassLoader())
+         if (classLoaderValidator != null)
          {
-            unregisterClassLoader(advisor.getClazz().getClassLoader());
-            return false;
+            if (classLoaderValidator.isValidClassLoader(advisor.getClazz().getClassLoader()))
+            {
+               return true;
+            }
+            else
+            {
+               unregisterClassLoader(advisor.getClazz().getClassLoader());
+               return false;
+            }
          }
          else
          {
-            return true;
+            ScopedClassPool pool = (ScopedClassPool) getRegisteredClassPool(advisor.getClazz().getClassLoader());
+            if (pool == null) return false;
+            if (pool.isUnloadedClassLoader())
+            {
+               unregisterClassLoader(advisor.getClazz().getClassLoader());
+               return false;
+            }
+            else
+            {
+               return true;
+            }
          }
       }
    }