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

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

Author: scott.stark at jboss.org
Date: 2008-05-09 04:24:26 -0400 (Fri, 09 May 2008)
New Revision: 73200

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java
Log:
JBCTS-790, handle null deployment scope basename

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-05-09 07:29:25 UTC (rev 73199)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java	2008-05-09 08:24:26 UTC (rev 73200)
@@ -127,7 +127,7 @@
          if (deployment.isScoped()) continue;
          if (deployment.getEntityManagerName().equals(unitName))
          {
-            if (deploymentScope == null || deployment.getKernelName().contains(deploymentScope.getBaseName())) return deployment; 
+            if (deploymentScope == null || deploymentScope.getBaseName() == null || deployment.getKernelName().contains(deploymentScope.getBaseName())) return deployment; 
          }
       }
       return rtn;