[jboss-cvs] JBossAS SVN: r64147 - in projects/aop/trunk: aop/src/main/org/jboss/aop/classpool and 1 other directories.

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

Author: adrian at jboss.org
Date: 2007-07-19 16:30:54 -0400 (Thu, 19 Jul 2007)
New Revision: 64147

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPScopedClassLoaderHelperBridge.java
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
Log:
Hack so you can redeploy scoped AOP.
This needs fixing properly.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java	2007-07-19 20:24:58 UTC (rev 64146)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java	2007-07-19 20:30:54 UTC (rev 64147)
@@ -81,6 +81,12 @@
       manager.addSubDomainByName(this);
    }
 
+   // FIXME: JBAOP-107 REMOVE THIS HACK
+   public boolean isValid()
+   {
+      return true;
+   }
+   
    public String getDomainName()
    {
       return name;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPScopedClassLoaderHelperBridge.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPScopedClassLoaderHelperBridge.java	2007-07-19 20:24:58 UTC (rev 64146)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPScopedClassLoaderHelperBridge.java	2007-07-19 20:30:54 UTC (rev 64147)
@@ -76,6 +76,14 @@
          {
             Object loaderRepository = delegate.getLoaderRepository(classLoader);
             scopedManager = scopedClassLoaderDomains.get(loaderRepository);
+            
+            // FIXME: JBAOP-107 REMOVE THIS HACK
+            if (scopedManager != null && scopedManager.isValid() == false)
+            {
+               scopedClassLoaderDomains.remove(loaderRepository);
+               scopedManager = null;
+            }
+            
             if (scopedManager == null)
             {
                scopedManager = delegate.getScopedClassLoaderDomain(scopedClassLoader, parent);

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java	2007-07-19 20:24:58 UTC (rev 64146)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java	2007-07-19 20:30:54 UTC (rev 64147)
@@ -72,6 +72,15 @@
       return null;
    }
    
+   // FIXME: JBAOP-107 REMOVE THIS HACK
+   public boolean isValid()
+   {
+      RepositoryClassLoader cl = (RepositoryClassLoader) getClassLoader();
+      if (cl == null)
+         return false;
+      return cl.getLoaderRepository() != null;
+   }
+
    public void removeAspectDefinition(String name)
    {
       AspectDefinition def = super.internalRemoveAspectDefintion(name);