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

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

Author: alex.loubyansky at jboss.com
Date: 2008-05-15 10:01:47 -0400 (Thu, 15 May 2008)
New Revision: 73419

Modified:
   trunk/server/src/main/org/jboss/deployment/JBossAppParsingDeployer.java
Log:
JBAS-5524

Modified: trunk/server/src/main/org/jboss/deployment/JBossAppParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossAppParsingDeployer.java	2008-05-15 14:01:10 UTC (rev 73418)
+++ trunk/server/src/main/org/jboss/deployment/JBossAppParsingDeployer.java	2008-05-15 14:01:47 UTC (rev 73419)
@@ -30,15 +30,12 @@
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.ejb.deployers.EjbDeployerMBean;
 import org.jboss.metadata.common.jboss.LoaderRepositoryConfigMetaData;
 import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
 import org.jboss.metadata.ear.spec.EarMetaData;
 import org.jboss.mx.loading.LoaderRepositoryFactory;
 import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
-import org.jboss.virtual.VirtualFile;
 
 /**
  * An ObjectModelFactoryDeployer for translating jboss-app.xml descriptors into
@@ -152,6 +149,8 @@
       if(specMetaData == null && metaData == null)
          return;
 
+      LoaderRepositoryConfig loaderCfg = null;
+
       // If there no JBossMetaData was created from a jboss-app.xml, create one
       if (metaData == null)
       {
@@ -160,12 +159,6 @@
       else
       {
          LoaderRepositoryMetaData lrmd = metaData.getLoaderRepository();
-         LoaderRepositoryConfig loaderCfg = null;
-         if (loaderCfg == null && isolated)
-         {
-            // If no config was given and isolation is on, create an isolated config
-            loaderCfg = initLoaderRepository(metaData, unit);
-         }
          if (lrmd != null)
          {
             loaderCfg = new LoaderRepositoryConfig();
@@ -189,10 +182,18 @@
                loaderCfg.repositoryConfig = config.getConfig();
             }
          }
-         // Add the loader repository config
-         if (loaderCfg != null)
-            unit.addAttachment(LoaderRepositoryConfig.class, loaderCfg);
       }
+
+      if (loaderCfg == null && isolated)
+      {
+         // If no config was given and isolation is on, create an isolated config
+         loaderCfg = initLoaderRepository(metaData, unit);
+      }
+
+      // Add the loader repository config
+      if (loaderCfg != null)
+         unit.addAttachment(LoaderRepositoryConfig.class, loaderCfg);
+
       // Create a merged view
       JBossAppMetaData mergedMetaData = new JBossAppMetaData();
       mergedMetaData.merge(metaData, specMetaData);