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

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

Author: bdecoste
Date: 2008-02-18 12:28:52 -0500 (Mon, 18 Feb 2008)
New Revision: 69893

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java
Log:
[JBAS-5043] find correct PU

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java	2008-02-18 17:27:56 UTC (rev 69892)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java	2008-02-18 17:28:52 UTC (rev 69893)
@@ -125,7 +125,10 @@
       for (PersistenceUnitDeployment deployment : PersistenceUnitRegistry.getPersistenceUnits())
       {
          if (deployment.isScoped()) continue;
-         if (deployment.getEntityManagerName().equals(unitName)) return deployment;
+         if (deployment.getEntityManagerName().equals(unitName))
+         {
+            if (deploymentScope == null || deployment.getKernelName().contains(deploymentScope.getBaseName())) return deployment; 
+         }
       }
       return rtn;
    }