[jboss-cvs] JBossAS SVN: r66449 - in projects/aop/trunk: asintegration/src/main/org/jboss/aop/asintegration/jboss5 and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2007-10-25 15:45:24 -0400 (Thu, 25 Oct 2007)
New Revision: 66449

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPool.java
Log:
[JBAOP-409] Fix check for subscribedSubDomains when undeploying bindings. Implement JBoss5ClassPool.isUnloadedClassLoader() to keep track of if pool has been killed

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java	2007-10-25 19:03:27 UTC (rev 66448)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java	2007-10-25 19:45:24 UTC (rev 66449)
@@ -1364,7 +1364,7 @@
             if (ref != null) domain = (Domain)ref.get();
             if (domain != null)
             {
-               if (subscribedSubDomains.containsKey(domain))
+               if (subscribedSubDomains.containsKey(domain) || subscribedSubDomainsQueue.containsKey(domain))
                {
                   if (!domain.isAdvisorRegistered(advisor))continue;
                }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java	2007-10-25 19:03:27 UTC (rev 66448)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java	2007-10-25 19:45:24 UTC (rev 66449)
@@ -145,7 +145,7 @@
          parent.unsubscribeSubDomain(this);
       }
    }
-
+   
    @Override
    public LinkedHashMap getBindings()
    {

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPool.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPool.java	2007-10-25 19:03:27 UTC (rev 66448)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPool.java	2007-10-25 19:45:24 UTC (rev 66449)
@@ -32,9 +32,9 @@
 import javassist.scopedpool.ScopedClassPoolRepository;
 
 import org.jboss.aop.classpool.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPoolRepository;
 import org.jboss.classloader.spi.base.BaseClassLoader;
 import org.jboss.logging.Logger;
-import org.jboss.mx.loading.RepositoryClassLoader;
 import org.jboss.virtual.plugins.context.memory.MemoryContextFactory;
 
 /**
@@ -49,6 +49,7 @@
    protected URL tempURL = null;
    // For loadClass tmpdir creation for UCL
    protected final Object tmplock = new Object();
+   boolean closed;
    
    protected JBoss5ClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository, URL tmpURL)
    {
@@ -63,15 +64,15 @@
 
    public boolean isUnloadedClassLoader()
    {
-      if (getClassLoader() instanceof RepositoryClassLoader)
-      {
-         RepositoryClassLoader rcl = (RepositoryClassLoader) getClassLoader();
-         return rcl.getLoaderRepository() == null;
-      }
-      return false;
+      return closed;
    }
 
-   
+   public void close()
+   {
+      closed = true;
+      super.close();
+   }
+
    public Class toClass(CtClass cc, ClassLoader loader, ProtectionDomain domain) throws CannotCompileException
    {
       lockInCache(cc);
@@ -117,21 +118,4 @@
        throw cfe;
       }
    }
-   
-//   protected boolean isLocalResource(String resourceName)
-//   {
-//      if (super.isLocalResource(resourceName))
-//      {
-//         return true;
-//      }
-//      
-//      File file = new File(tempdir, resourceName);
-//      if (file.exists())
-//      {
-//         return true;
-//      }
-//      
-//      return false;
-//   }
-
 }