[jboss-cvs] JBossAS SVN: r70236 - projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3.

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

Author: bdecoste
Date: 2008-02-28 23:05:39 -0500 (Thu, 28 Feb 2008)
New Revision: 70236

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
Log:
JaccHelper.configureContainer(..) had the side effect of reinitializing the container aop metadata on container restart, so now doing it explicitly

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2008-02-29 02:03:54 UTC (rev 70235)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2008-02-29 04:05:39 UTC (rev 70236)
@@ -65,6 +65,8 @@
 import org.jboss.aop.advice.Interceptor;
 import org.jboss.aop.annotation.AnnotationElement;
 import org.jboss.aop.joinpoint.ConstructorInvocation;
+import org.jboss.aop.metadata.SimpleClassMetaDataBinding;
+import org.jboss.aop.metadata.SimpleClassMetaDataLoader;
 import org.jboss.aop.util.MethodHashing;
 import org.jboss.ejb3.annotation.Clustered;
 import org.jboss.ejb3.annotation.SecurityDomain;
@@ -82,6 +84,7 @@
 import org.jboss.ejb3.pool.Pool;
 import org.jboss.ejb3.pool.PoolFactory;
 import org.jboss.ejb3.pool.PoolFactoryRegistry; 
+import org.jboss.ejb3.security.JaccAuthorizationInterceptor;
 import org.jboss.ejb3.security.SecurityDomainManager;
 import org.jboss.ejb3.statistics.InvocationStatistics;
 import org.jboss.ejb3.tx.UserTransactionImpl;
@@ -742,9 +745,15 @@
    }
    
    protected void reinitialize()
-   {          
-      super.initializeMethodChain();
+   {         
+      initClassMetaDataBindingsList();
+      adviceBindings.clear();
+      doesHaveAspects = false;
+      constructorInfos = null;
+      rebuildInterceptors();
+      
       bindEJBContext();
+      
       reinitialize = false;
    }
 
@@ -767,7 +776,7 @@
    {
       if (reinitialize)
          reinitialize();
-      
+       
       initializePool();
 
       for (EncInjector injector : encInjectors.values())
@@ -794,6 +803,8 @@
    {
       reinitialize = true;
       
+      //encFactory.cleanupEnc(this);
+      
       if (pool != null)
       {
          pool.destroy();