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

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

Author: smarlow at redhat.com
Date: 2010-12-21 23:19:04 -0500 (Tue, 21 Dec 2010)
New Revision: 110117

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java
Log:
EJBTHREE-2222 workaround for PostConstruct NPE

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java	2010-12-22 03:18:10 UTC (rev 110116)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java	2010-12-22 04:19:04 UTC (rev 110117)
@@ -148,16 +148,17 @@
       try
       {
          injectBeanContext(sfctx);
+         StatefulBeanContext.currentBean.push(sfctx);
+         invokePostConstruct(sfctx);
       }
       finally
       {
+         StatefulBeanContext.currentBean.pop();
          popContext();
          // this is for propagated extended PC's
          sfctx.popContainedIn();
       }
 
-      invokePostConstruct(sfctx);
-
       return sfctx;
    }