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

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

Author: bdecoste
Date: 2008-02-11 15:07:17 -0500 (Mon, 11 Feb 2008)
New Revision: 69778

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/entity/ManagedEntityManagerFactory.java
Log:
[JBPAPP-621] fixed NPE for EntityManager injection in @PostConstruct

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/entity/ManagedEntityManagerFactory.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/entity/ManagedEntityManagerFactory.java	2008-02-11 19:59:04 UTC (rev 69777)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/entity/ManagedEntityManagerFactory.java	2008-02-11 20:07:17 UTC (rev 69778)
@@ -56,6 +56,8 @@
    public EntityManager getNonTxEntityManager()
    {
       Map map = nonTxStack.get();
+      if (map == null)
+         map = new IdentityHashMap();
       EntityManager em = (EntityManager)map.get(this);
       if (em == null)
       {