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

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

Author: kabir.khan at jboss.com
Date: 2008-01-17 15:29:41 -0500 (Thu, 17 Jan 2008)
New Revision: 69086

Modified:
   trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java
Log:
[JBAS-5147] Fix AOP tests. For some reason BaseClassLoader.isValid() throws an excpetion instead of returning false

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-17 20:18:11 UTC (rev 69085)
+++ trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java	2008-01-17 20:29:41 UTC (rev 69086)
@@ -60,13 +60,16 @@
    public boolean isValidClassLoader(ClassLoader loader)
    {
       boolean isValid = false;
-      if (loader instanceof RepositoryClassLoader)
+      try
       {
-         isValid = ((RepositoryClassLoader) loader).getLoaderRepository() != null;
+         if(loader instanceof RealClassLoader)
+         {
+            isValid = ((RealClassLoader) loader).isValid();
+         }
       }
-      else if(loader instanceof RealClassLoader)
+      catch (RuntimeException e)
       {
-         isValid = ((RealClassLoader) loader).isValid();
+         // Annoyingly, BaseClassLoader.isValid() throws an exception if the classloader is invalid
       }
       return isValid;
    }