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

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

Author: kabir.khan at jboss.com
Date: 2006-09-13 07:05:51 -0400 (Wed, 13 Sep 2006)
New Revision: 56792

Modified:
   trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java
   trunk/aspects/src/main/org/jboss/aop/deployment/ScopedJBossClassPool.java
Log:
Fix infinite loop problem resulting from previous quick fix

Modified: trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java
===================================================================
--- trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java	2006-09-13 10:15:54 UTC (rev 56791)
+++ trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java	2006-09-13 11:05:51 UTC (rev 56792)
@@ -77,29 +77,24 @@
       AOPClassPoolRepository.getInstance().perfomUnregisterClassLoader(getClassLoader());
    }
 
-   
-   protected ClassLoader getClassLoader0()
-   {
-      try
-      {
-         return getClassLoader();
-      }
-      catch (RuntimeException e)
-      {
-         //Ignore, the ScopedClassPoll throws an exception if pool is not associated with a cl
-      }
-      return null;
-   }
-   
    public CtClass getCached(String classname)
    {
       CtClass clazz = getCachedLocally(classname);
       if (clazz == null)
       {
          boolean isLocal = false; 
-         
-         ClassLoader cl = getClassLoader0();
 
+         //FIXME - Once Javassist > 3.3.0 is out use getClassLoader0() and get rid of try/catch
+         ClassLoader cl = null;
+         try
+         {
+            cl =  getClassLoader();
+         }
+         catch (RuntimeException e)
+         {
+            //Ignore, the ScopedClassPoll throws an exception if pool is not associated with a cl
+         }
+
          if (cl != null)
          {
             String classResourceName = getResourceName(classname);

Modified: trunk/aspects/src/main/org/jboss/aop/deployment/ScopedJBossClassPool.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aop/deployment/ScopedJBossClassPool.java	2006-09-13 10:15:54 UTC (rev 56791)
+++ trunk/aspects/src/main/org/jboss/aop/deployment/ScopedJBossClassPool.java	2006-09-13 11:05:51 UTC (rev 56792)
@@ -79,7 +79,16 @@
 
    private HeirarchicalLoaderRepository3 getRepository()
    {
-      ClassLoader cl = getClassLoader0();
+      //FIXME - Once Javassist > 3.3.0 is out use getClassLoader0() and get rid of try/catch
+      ClassLoader cl = null;
+      try
+      {
+         cl =  getClassLoader();
+      }
+      catch (RuntimeException e)
+      {
+         //Ignore, the ScopedClassPoll throws an exception if pool is not associated with a cl
+      }
       if (cl != null)
       {
          return (HeirarchicalLoaderRepository3)((RepositoryClassLoader)cl).getLoaderRepository();