[jboss-cvs] JBossAS SVN: r69007 - trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5.

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

Author: scott.stark at jboss.org
Date: 2008-01-15 23:18:15 -0500 (Tue, 15 Jan 2008)
New Revision: 69007

Modified:
   trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java
Log:
JBCTS-742, update isValidClassLoader for the new RealClassLoader type

Modified: trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java	2008-01-16 03:47:01 UTC (rev 69006)
+++ trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java	2008-01-16 04:18:15 UTC (rev 69007)
@@ -31,6 +31,7 @@
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
 import org.jboss.aop.asintegration.JBossIntegration;
+import org.jboss.classloading.spi.RealClassLoader;
 import org.jboss.mx.loading.RepositoryClassLoader;
 
 /**
@@ -58,8 +59,16 @@
    
    public boolean isValidClassLoader(ClassLoader loader)
    {
-      if (!(loader instanceof RepositoryClassLoader)) return false;
-      return ((RepositoryClassLoader) loader).getLoaderRepository() != null;
+      boolean isValid = false;
+      if (loader instanceof RepositoryClassLoader)
+      {
+         isValid = ((RepositoryClassLoader) loader).getLoaderRepository() != null;
+      }
+      else if(loader instanceof RealClassLoader)
+      {
+         isValid = ((RealClassLoader) loader).isValid();
+      }
+      return isValid;
    }
 
    public void setScopingPolicy(AOPClassLoaderScopingPolicy policy)