[jboss-cvs] JBossAS SVN: r67985 - in trunk/ejb3/src/main/org/jboss/ejb3: enc and 1 other directory.

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

Author: wolfc
Date: 2007-12-06 05:57:38 -0500 (Thu, 06 Dec 2007)
New Revision: 67985

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
   trunk/ejb3/src/main/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java
Log:
EJBTHREE-1067: Fixed NPE

Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java	2007-12-06 10:10:32 UTC (rev 67984)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java	2007-12-06 10:57:38 UTC (rev 67985)
@@ -337,6 +337,7 @@
 
    protected void processEJBContainerMetadata(Container container) throws Exception
    {
+      log.trace("Process EJB container metadata " + container);
       ObjectName on = container.getObjectName();
       ejbContainers.put(on, container);
       container.processMetadata();

Modified: trunk/ejb3/src/main/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java	2007-12-06 10:10:32 UTC (rev 67984)
+++ trunk/ejb3/src/main/org/jboss/ejb3/enc/DeploymentPersistenceUnitResolver.java	2007-12-06 10:57:38 UTC (rev 67985)
@@ -55,7 +55,7 @@
 
    public PersistenceUnitDeployment getPersistenceUnitDeployment(String unitName) throws NameNotFoundException
    {
-      if ("".equals(unitName))
+      if (unitName == null || "".equals(unitName))
       {
          if (persistenceUnitDeployments == null)
          {