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

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

Author: kabir.khan at jboss.com
Date: 2009-04-27 09:46:44 -0400 (Mon, 27 Apr 2009)
New Revision: 87865

Modified:
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/Domain.java
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ArrayAdvisor.java
   projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/domain/ScopedClassLoaderDomain.java
Log:
[JBAOP-707] Fixes for when running with scoped classloaders in JBoss

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java	2009-04-27 13:20:21 UTC (rev 87864)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java	2009-04-27 13:46:44 UTC (rev 87865)
@@ -2054,11 +2054,13 @@
       }
    }
 
+   @Deprecated
    public Object getPerVMAspect(AspectDefinition def)
    {
       return getPerVMAspect(def.getName());
    }
 
+   @Deprecated
    public Object getPerVMAspect(String def)
    {
       return getPerVMAspect(def, null);

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/Domain.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/Domain.java	2009-04-27 13:20:21 UTC (rev 87864)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/Domain.java	2009-04-27 13:46:44 UTC (rev 87865)
@@ -861,7 +861,7 @@
       Object factory = null;
       if (parentFirst)
       {
-         factory = parent.getPerVMAspect(def);
+         factory = parent.getPerVMAspect(def, advisor);
          if (factory != null) return factory;
       }
       factory = super.getPerVMAspect(def, advisor);

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ArrayAdvisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ArrayAdvisor.java	2009-04-27 13:20:21 UTC (rev 87864)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ArrayAdvisor.java	2009-04-27 13:46:44 UTC (rev 87865)
@@ -482,7 +482,7 @@
                }
                else if (factory instanceof ScopedInterceptorFactory)
                {
-                  return (Interceptor) AspectManager.instance().getPerVMAspect(factory.getAspect());
+                  return (Interceptor) AspectManager.instance().getPerVMAspect(factory.getAspect(), null);
                }
             }
             

Modified: projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/domain/ScopedClassLoaderDomain.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/domain/ScopedClassLoaderDomain.java	2009-04-27 13:20:21 UTC (rev 87864)
+++ projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/domain/ScopedClassLoaderDomain.java	2009-04-27 13:46:44 UTC (rev 87865)
@@ -121,7 +121,7 @@
    
    protected Object getSuperPerVmAspect(String def)
    {
-      return super.getPerVMAspect(def);
+      return super.getPerVMAspect(def, null);
    }
    
    protected abstract Object getPerVmAspectWithNoParentDelegation(String def);