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

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

Author: alesj
Date: 2009-03-16 10:33:42 -0400 (Mon, 16 Mar 2009)
New Revision: 85929

Modified:
   trunk/server/src/main/org/jboss/deployment/EarClassLoaderDeployer.java
Log:
[JBAS-6600]; fix ear cl isolation.

Modified: trunk/server/src/main/org/jboss/deployment/EarClassLoaderDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EarClassLoaderDeployer.java	2009-03-16 14:22:28 UTC (rev 85928)
+++ trunk/server/src/main/org/jboss/deployment/EarClassLoaderDeployer.java	2009-03-16 14:33:42 UTC (rev 85929)
@@ -79,21 +79,21 @@
          return;
 
       LoaderRepositoryMetaData lrmd = metaData.getLoaderRepository();
-      if (lrmd != null)
+      if (lrmd != null && LoaderRepositoryMetaDataHelper.create(unit, lrmd) != null)
+         return;
+
+      // For isolated automatically create the classloader in a new domain
+      if (isolated)
       {
-         ClassLoadingMetaData clmd = LoaderRepositoryMetaDataHelper.create(unit, lrmd);
-         // For isolated automatically create the classloader in a new domain
-         if (clmd == null && isolated)
-         {
-            String domain = EARDeployment.getJMXName(metaData, unit) + ",extension=LoaderRepository";
-            classLoadingMetaData = new ClassLoadingMetaData();
-            classLoadingMetaData.setName(unit.getName());
-            classLoadingMetaData.setDomain(domain);
-            classLoadingMetaData.setExportAll(ExportAll.NON_EMPTY);
-            classLoadingMetaData.setImportAll(true);
-            classLoadingMetaData.setVersion(Version.DEFAULT_VERSION);
-            classLoadingMetaData.setJ2seClassLoadingCompliance(false);
-         }
+         String domain = EARDeployment.getJMXName(metaData, unit) + ",extension=LoaderRepository";
+         classLoadingMetaData = new ClassLoadingMetaData();
+         classLoadingMetaData.setName(unit.getName());
+         classLoadingMetaData.setDomain(domain);
+         classLoadingMetaData.setExportAll(ExportAll.NON_EMPTY);
+         classLoadingMetaData.setImportAll(true);
+         classLoadingMetaData.setVersion(Version.DEFAULT_VERSION);
+         classLoadingMetaData.setJ2seClassLoadingCompliance(false);
+         unit.addAttachment(ClassLoadingMetaData.class, classLoadingMetaData);
       }
    }
 }