[jboss-cvs] JBossAS SVN: r67801 - branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3.

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

Author: bdecoste
Date: 2007-12-03 15:16:13 -0500 (Mon, 03 Dec 2007)
New Revision: 67801

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
Log:
[JBPAPP-478] merged fix for [EJBTHREE-1090]

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-12-03 20:15:23 UTC (rev 67800)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-12-03 20:16:13 UTC (rev 67801)
@@ -337,6 +337,9 @@
    {
       this.dependencyPolicy = dependencyPolicy;
       // XML must be done first so that any annotation overrides are initialized
+      
+      // EJBTHREE-1090 moved from create()
+      initializeClassContainer();
 
       // todo injection handlers should be pluggable from XML
       Collection<InjectionHandler> handlers = new ArrayList<InjectionHandler>();
@@ -545,7 +548,8 @@
    public void create() throws Exception
    {
       // EJBTHREE-655: we need an instance after create
-      initializeClassContainer();
+      // initializeClassContainer();
+      // EJBTHREE-1090 moved to processMetaData()
       for (int i = 0; i < constructors.length; i++)
       {
          if (constructors[i].getParameterTypes().length == 0)