[jboss-cvs] JBossAS SVN: r67910 - trunk/server/src/main/org/jboss/deployment.

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

Author: scott.stark at jboss.org
Date: 2007-12-04 17:25:21 -0500 (Tue, 04 Dec 2007)
New Revision: 67910

Modified:
   trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
Log:
Handle ignoreMissingStandardJBossXml = true case of no standardjboss.xml setting

Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2007-12-04 21:44:40 UTC (rev 67909)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java	2007-12-04 22:25:21 UTC (rev 67910)
@@ -108,11 +108,10 @@
       EjbJarMetaData ejbJarMetaData = unit.getAttachment(EjbJarMetaData.class);
       if (ejbJarMetaData != null || jbossMetaData != null)
       {
-
-         // Wrap in the standardjboss.xml 
+         // Save this as a transient(non-managed) attachment
          JBossMetaData stdMetaData = getStandardMetaData();
-         // Save this as a transient(non-managed) attachment
-         unit.addAttachment("standardjboss.xml", stdMetaData);
+         if(stdMetaData != null)
+            unit.addAttachment("standardjboss.xml", stdMetaData);
 
          if (jbossMetaData != null)
          {
@@ -194,8 +193,12 @@
             {
                // Use default server conf/standardjboss.xml location
                String configPath = System.getProperty(ServerConfig.SERVER_CONFIG_URL);
-               if(configPath == null && ignoreMissingStandardJBossXml == false)
-                  throw new DeploymentException("standardjboss.xml not specified and "+ServerConfig.SERVER_CONFIG_URL+" does not exist");
+               if(configPath == null )
+               {
+                  if(ignoreMissingStandardJBossXml == false)
+                     throw new DeploymentException("standardjboss.xml not specified and "+ServerConfig.SERVER_CONFIG_URL+" does not exist");
+                  return null;
+               }
                URL configUrl = new URL(configPath);
                standardJBossXmlPath = new URL(configUrl, "standardjboss.xml");
             }