[jboss-cvs] JBossAS SVN: r72949 - projects/aop/trunk/aop/src/main/org/jboss/aop.

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

Author: flavia.rainone at jboss.com
Date: 2008-05-01 13:08:08 -0400 (Thu, 01 May 2008)
New Revision: 72949

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/AspectXmlLoader.java
Log:
[JBAOP-554] Now interceptor factories are created only when there is not a factory with the same name available.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectXmlLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectXmlLoader.java	2008-05-01 17:06:04 UTC (rev 72948)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectXmlLoader.java	2008-05-01 17:08:08 UTC (rev 72949)
@@ -209,8 +209,12 @@
          def = new AspectDefinition(name, scope, aspectFactory);
          manager.addAspectDefinition(def);
       }
-      ScopedInterceptorFactory factory = new ScopedInterceptorFactory(def);
-      manager.addInterceptorFactory(factory.getName(), factory);
+      InterceptorFactory factory = manager.getInterceptorFactory(name); 
+      if (factory == null)
+      {
+         factory = new ScopedInterceptorFactory(def);
+         manager.addInterceptorFactory(name, factory);
+      }
       return factory;
    }