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

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

Author: kabir.khan at jboss.com
Date: 2008-04-29 11:44:23 -0400 (Tue, 29 Apr 2008)
New Revision: 72866

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java
Log:
Duplicate code

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java	2008-04-29 15:31:23 UTC (rev 72865)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java	2008-04-29 15:44:23 UTC (rev 72866)
@@ -255,32 +255,18 @@
    {
       initializeMethodChain();
       initializeConstructorChain();
-
-      LinkedHashMap<String, AdviceBinding> bindings = manager.getBindings();
-      synchronized (bindings)
-      {
-         if (bindings.size() > 0)
-         {
-            for (AdviceBinding binding : bindings.values())
-            {
-               if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("iterate binding " + binding.getName());
-               resolveMethodPointcut(binding);
-               resolveConstructorPointcut(binding);
-            }
-         }
-      }
-      finalizeChain(constructorInfos);
-      finalizeMethodChain();
-      populateInterceptorsFromInfos();
-
-      doesHaveAspects = adviceBindings.size() > 0;
+      makeInterceptorChains();
    }
    
    protected void updateInterceptorChains()
    {
       resetChain(this.methodInfos);
       resetChain(this.constructorInfos);
+      makeInterceptorChains();
+   }
 
+   private void makeInterceptorChains()
+   {
       LinkedHashMap<String, AdviceBinding> bindings = manager.getBindings();
       synchronized (bindings)
       {
@@ -300,7 +286,7 @@
 
       doesHaveAspects = adviceBindings.size() > 0;
    }
-
+   
    /**
     * @return the value of chainOverridingForInheritedMethods
     * @see Advisor#chainOverridingForInheritedMethods()