[jboss-cvs] JBossAS SVN: r68653 - trunk/server/src/main/org/jboss/ejb/deployers.

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

Author: scott.stark at jboss.org
Date: 2008-01-07 12:50:22 -0500 (Mon, 07 Jan 2008)
New Revision: 68653

Modified:
   trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java
Log:
Validate the ear security domain for null

Modified: trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java	2008-01-07 15:29:14 UTC (rev 68652)
+++ trunk/server/src/main/org/jboss/ejb/deployers/MergedJBossMetaDataDeployer.java	2008-01-07 17:50:22 UTC (rev 68653)
@@ -96,7 +96,7 @@
          JBossAppMetaData earMetaData = topUnit.getAttachment(JBossAppMetaData.class);
          // Security domain
          String securityDomain = earMetaData.getSecurityDomain();
-         if(mergedMetaData.getSecurityDomain() == null)
+         if(securityDomain != null && mergedMetaData.getSecurityDomain() == null)
             mergedMetaData.setSecurityDomain(securityDomain);
          // TODO: Security roles
       }