[jboss-cvs] JBossAS SVN: r66390 - in projects/aop/trunk: asintegration/src/main/org/jboss/aop/asintegration/jboss4 and 2 other directories.

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

Author: kabir.khan at jboss.com
Date: 2007-10-24 12:45:51 -0400 (Wed, 24 Oct 2007)
New Revision: 66390

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedJBossClassPool.java
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/ScopedJBoss5ClassPool.java
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/classpool/TempJBossClassPool.java
Log:
[JBAOP-409] Fix mistake, we should be checking the candidate pool rather than AOPCLassPool itself

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java	2007-10-24 15:12:07 UTC (rev 66389)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java	2007-10-24 16:45:51 UTC (rev 66390)
@@ -115,7 +115,7 @@
                      }
                      
                      //Do not check classpools for scoped classloaders
-                     if (!includeInGlobalSearch())
+                     if (!pool.includeInGlobalSearch())
                      {
                         continue;
                      }

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedJBossClassPool.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedJBossClassPool.java	2007-10-24 15:12:07 UTC (rev 66389)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedJBossClassPool.java	2007-10-24 16:45:51 UTC (rev 66390)
@@ -188,7 +188,8 @@
 
       return null;
    }
-   
+
+   @Override
    protected boolean includeInGlobalSearch()
    {
       return false;

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/ScopedJBoss5ClassPool.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/ScopedJBoss5ClassPool.java	2007-10-24 15:12:07 UTC (rev 66389)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/ScopedJBoss5ClassPool.java	2007-10-24 16:45:51 UTC (rev 66390)
@@ -161,6 +161,7 @@
       return null;
    }
    
+   @Override
    protected boolean includeInGlobalSearch()
    {
       return false;

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/classpool/TempJBossClassPool.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/classpool/TempJBossClassPool.java	2007-10-24 15:12:07 UTC (rev 66389)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/classpool/TempJBossClassPool.java	2007-10-24 16:45:51 UTC (rev 66390)
@@ -67,5 +67,4 @@
       }
       return clazz;
    }
-
 }