[jboss-cvs] JBossAS SVN: r61561 - in branches/Branch_4_2/ejb3/src: test/org/jboss/ejb3/test/entity and 1 other directories.

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

Author: epbernard
Date: 2007-03-22 01:26:57 -0400 (Thu, 22 Mar 2007)
New Revision: 61561

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedEntityManager.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTest.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/unit/EntityUnitTestCase.java
Log:
EJBTHREE-687 em.getDelegate() delegates to the inner em.getDelegate() method

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedEntityManager.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedEntityManager.java	2007-03-22 00:47:48 UTC (rev 61560)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/ExtendedEntityManager.java	2007-03-22 05:26:57 UTC (rev 61561)
@@ -181,7 +181,7 @@
 
    public Object getDelegate()
    {
-      return getPersistenceContext();
+      return getPersistenceContext().getDelegate();
    }
 
 }

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-03-22 00:47:48 UTC (rev 61560)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/TransactionScopedEntityManager.java	2007-03-22 05:26:57 UTC (rev 61561)
@@ -81,7 +81,7 @@
 
    public Object getDelegate()
    {
-      return factory.getTransactionScopedEntityManager();
+      return factory.getTransactionScopedEntityManager().getDelegate();
    }
 
    public void joinTransaction()

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTest.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTest.java	2007-03-22 00:47:48 UTC (rev 61560)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTest.java	2007-03-22 05:26:57 UTC (rev 61561)
@@ -67,4 +67,6 @@
    void changeCustomer(Long id, String name);
    
    Customer loadCustomer(Long id);
+
+   boolean isDelegateASession();
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java	2007-03-22 00:47:48 UTC (rev 61560)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java	2007-03-22 05:26:57 UTC (rev 61561)
@@ -290,4 +290,8 @@
 	   Customer c =  manager.find(Customer.class, id);
 	   return c;
    }
+
+   public boolean isDelegateASession() {
+      return (manager.getDelegate() != null) && (manager.getDelegate() instanceof Session);
+   }
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/unit/EntityUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/unit/EntityUnitTestCase.java	2007-03-22 00:47:48 UTC (rev 61560)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entity/unit/EntityUnitTestCase.java	2007-03-22 05:26:57 UTC (rev 61561)
@@ -202,6 +202,12 @@
 	  assertEquals("Bill", c2.getName());
    }
 
+   public void testGetDelegate() throws Exception
+   {
+      EntityTest test = (EntityTest) this.getInitialContext().lookup("EntityTestBean/remote");
+      assertTrue( "delegate is not an hibernate Session", test.isDelegateASession() );
+   }
+
    public static Test suite() throws Exception
    {
       return getDeploySetup(EntityUnitTestCase.class, "entity-test.jar");