[jboss-cvs] JBossAS SVN: r61436 - branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3.

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

Author: wolfc
Date: 2007-03-19 09:21:13 -0400 (Mon, 19 Mar 2007)
New Revision: 61436

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
Log:
EJBTHREE-840: using aop 1.5.5.GA

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-03-19 13:20:59 UTC (rev 61435)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-03-19 13:21:13 UTC (rev 61436)
@@ -549,30 +549,7 @@
 
    public void destroy() throws Exception
    {
-      // FIXME: temporary hack: cleanup all references from aop to here
-      
-      @SuppressWarnings("unchecked")
-      Set<AspectDefinition> set = (Set<AspectDefinition>) perInstanceAspectDefinitions;
-      for(AspectDefinition def : set)
-      {
-         removePerInstanceAspect(def);
-         def.advisors.remove(this);
-      }
-      for(AspectDefinition def : ((Map<AspectDefinition,?>) perInstanceJoinpointAspectDefinitions).keySet())
-      {
-         removePerInstanceJoinpointAspect(def);
-         def.advisors.remove(this);
-      }
-      // weirdness, add/removePerClassAspect are not mirror images
-      @SuppressWarnings("unchecked")
-      Map<AspectDefinition, Interceptor> map = ((Map<AspectDefinition, Interceptor>) adviceInterceptors);
-      // without toArray, concurrent modification
-      for(AspectDefinition def : map.keySet().toArray(new AspectDefinition[0]))
-      {
-         assert def.getScope() == Scope.PER_CLASS;
-         removePerClassAspect(def);
-         def.advisors.remove(this);
-      }
+      super.cleanup();
    }
 
    protected void initializePool() throws Exception