[jboss-cvs] JBossAS SVN: r87501 - branches/Branch_5_x/connector/src/main/org/jboss/resource/deployers/management.

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

Author: emuckenhuber
Date: 2009-04-17 12:01:38 -0400 (Fri, 17 Apr 2009)
New Revision: 87501

Modified:
   branches/Branch_5_x/connector/src/main/org/jboss/resource/deployers/management/SecurityDomainMetaMapper.java
Log:
[JBAS-6796] ignore a null domain.

Modified: branches/Branch_5_x/connector/src/main/org/jboss/resource/deployers/management/SecurityDomainMetaMapper.java
===================================================================
--- branches/Branch_5_x/connector/src/main/org/jboss/resource/deployers/management/SecurityDomainMetaMapper.java	2009-04-17 16:01:32 UTC (rev 87500)
+++ branches/Branch_5_x/connector/src/main/org/jboss/resource/deployers/management/SecurityDomainMetaMapper.java	2009-04-17 16:01:38 UTC (rev 87501)
@@ -117,9 +117,13 @@
       if(metaValue instanceof CompositeValue)
       {
          CompositeValue compositeValue = (CompositeValue) metaValue;
+
+         String domainName = (String) metaValueFactory.unwrap(compositeValue.get(DOMAIN));
+         // TODO should this be allowed?
+         if(domainName == null)
+            return null;
          
          SecurityDeploymentType deploymentType = (SecurityDeploymentType) metaValueFactory.unwrap(compositeValue.get(DeploymentTypeName));
-         String domainName = (String) metaValueFactory.unwrap(compositeValue.get(DOMAIN));
          if(deploymentType == null)
             deploymentType = SecurityDeploymentType.NONE;