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

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

Author: scott.stark at jboss.org
Date: 2008-01-08 19:32:14 -0500 (Tue, 08 Jan 2008)
New Revision: 68714

Modified:
   trunk/server/src/main/org/jboss/deployment/JBossAppParsingDeployer.java
   trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java
Log:
Validate LoaderRepositoryMetaData.name against null to avoid invalid ObjectName creation

Modified: trunk/server/src/main/org/jboss/deployment/JBossAppParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossAppParsingDeployer.java	2008-01-09 00:26:17 UTC (rev 68713)
+++ trunk/server/src/main/org/jboss/deployment/JBossAppParsingDeployer.java	2008-01-09 00:32:14 UTC (rev 68714)
@@ -182,7 +182,8 @@
          {
             loaderCfg = new LoaderRepositoryConfig();
             loaderCfg.repositoryClassName = lrmd.getLoaderRepositoryClass();
-            loaderCfg.repositoryName = new ObjectName(lrmd.getName());
+            if(lrmd.getName() != null)
+               loaderCfg.repositoryName = new ObjectName(lrmd.getName());
             Set<LoaderRepositoryConfigMetaData> configs = lrmd.getLoaderRepositoryConfig();
             if (configs != null && configs.isEmpty() == false)
             {

Modified: trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java	2008-01-09 00:26:17 UTC (rev 68713)
+++ trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java	2008-01-09 00:32:14 UTC (rev 68714)
@@ -118,7 +118,8 @@
          LoaderRepositoryConfig loaderConfig = new LoaderRepositoryConfig();
          
          loaderConfig.repositoryClassName = lrmd.getLoaderRepositoryClass();
-         loaderConfig.repositoryName = new ObjectName(lrmd.getName());
+         if(lrmd.getName() != null)
+            loaderConfig.repositoryName = new ObjectName(lrmd.getName());
          Set<LoaderRepositoryConfigMetaData> configs = lrmd.getLoaderRepositoryConfig();
          if (configs != null && configs.isEmpty() == false)
          {