[Jboss-cvs] JBossAS SVN: r56033 - trunk/aspects/src/main/org/jboss/aop/deployment

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

Author: kabir.khan at jboss.com
Date: 2006-08-17 13:49:32 -0400 (Thu, 17 Aug 2006)
New Revision: 56033

Modified:
   trunk/aspects/src/main/org/jboss/aop/deployment/JBossScopedClassLoaderHelper.java
Log:
Better way to see if a scoped classloader

Modified: trunk/aspects/src/main/org/jboss/aop/deployment/JBossScopedClassLoaderHelper.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aop/deployment/JBossScopedClassLoaderHelper.java	2006-08-17 17:03:46 UTC (rev 56032)
+++ trunk/aspects/src/main/org/jboss/aop/deployment/JBossScopedClassLoaderHelper.java	2006-08-17 17:49:32 UTC (rev 56033)
@@ -23,6 +23,7 @@
 
 import org.jboss.aop.classpool.AOPScopedClassLoaderHelper;
 import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
+import org.jboss.mx.loading.LoaderRepository;
 import org.jboss.mx.loading.RepositoryClassLoader;
 import org.jboss.system.server.NoAnnotationURLClassLoader;
 
@@ -59,20 +60,13 @@
       boolean scoped = false;
       if (loader instanceof RepositoryClassLoader)
       {
-         ClassLoader parent = loader.getParent();
-         
-         //TODO is this really the best way to find out if we are scoped or not?
-         if (parent.getClass().equals(NoAnnotationURLClassLoader.class))
+         LoaderRepository repository = ((RepositoryClassLoader)loader).getLoaderRepository();
+         if (repository instanceof HeirarchicalLoaderRepository3)
          {
-            RepositoryClassLoader rloader = (RepositoryClassLoader)loader;
-            //Scoped with java2ParentDelegation=true
-            scoped = rloader.getLoaderRepository().getClass().equals(HeirarchicalLoaderRepository3.class);
+            scoped = true;
+            HeirarchicalLoaderRepository3 hlr = (HeirarchicalLoaderRepository3)repository;
+            boolean parentFirst = hlr.getUseParentFirst();
          }
-         else
-         {
-            //Scoped with java2ParentDelegation=false
-            scoped = parent.getClass().getName().equals("org.jboss.mx.loading.HeirarchicalLoaderRepository3$NoParentClassLoader");
-         }
       }
       return scoped;
    }