[jboss-cvs] JBossAS SVN: r60756 - in branches/Branch_4_2/ejb3/src/main/org/jboss: injection and 1 other directory.

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

Author: wolfc
Date: 2007-02-21 06:34:27 -0500 (Wed, 21 Feb 2007)
New Revision: 60756

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PcEncInjector.java
Log:
EJBTHREE-888: allow injection of HibernateEntityManager

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java	2007-02-21 11:33:14 UTC (rev 60755)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java	2007-02-21 11:34:27 UTC (rev 60756)
@@ -36,10 +36,15 @@
  * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  * @version $Revision$
  */
-public class TransactionScopedEntityManager implements EntityManager, HibernateSession, Externalizable
+public class TransactionScopedEntityManager implements HibernateEntityManager, HibernateSession, Externalizable
 {
    private transient ManagedEntityManagerFactory factory;
 
+   public Session getSession()
+   {
+      return getHibernateSession();
+   }
+   
    public Session getHibernateSession()
    {
       EntityManager em = factory.getTransactionScopedEntityManager();

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PcEncInjector.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PcEncInjector.java	2007-02-21 11:33:14 UTC (rev 60755)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/injection/PcEncInjector.java	2007-02-21 11:34:27 UTC (rev 60756)
@@ -102,7 +102,7 @@
       {
          Object entityManager = null;
          if (injectionType == null
-                 || injectionType.getName().equals(EntityManager.class.getName()))
+                 || EntityManager.class.isAssignableFrom(injectionType))
          {
             entityManager = new TransactionScopedEntityManager(factory);
          }