[jboss-cvs] JBossAS SVN: r81634 - projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency.

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

Author: alesj
Date: 2008-11-26 09:48:13 -0500 (Wed, 26 Nov 2008)
New Revision: 81634

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java
Log:
Check for null.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java	2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java	2008-11-26 14:48:13 UTC (rev 81634)
@@ -22,7 +22,9 @@
 package org.jboss.deployers.vfs.plugins.dependency;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import org.jboss.dependency.spi.Controller;
 import org.jboss.dependency.spi.ControllerContext;
@@ -78,7 +80,11 @@
 
       protected List<Object> getComponents(DeploymentAliases deployment)
       {
-         return new ArrayList<Object>(deployment.getAliases());
+         Set<Object> aliases = deployment.getAliases();
+         if (aliases != null && aliases.isEmpty() == false)
+            return new ArrayList<Object>(aliases);
+         else
+            return Collections.emptyList();
       }
 
       protected Class<Object> getComponentType()

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java	2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java	2008-11-26 14:48:13 UTC (rev 81634)
@@ -22,7 +22,9 @@
 package org.jboss.deployers.vfs.plugins.dependency;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import org.jboss.dependency.spi.DependencyItem;
 import org.jboss.deployers.spi.deployer.DeploymentStages;
@@ -60,7 +62,11 @@
 
       protected List<? extends DependencyItem> getComponents(DeploymentDependencies deployment)
       {
-         return new ArrayList<DependencyItem>(deployment.getDependencies());
+         Set<DependencyItem> items = deployment.getDependencies();
+         if (items != null && items.isEmpty() == false)
+            return new ArrayList<DependencyItem>(items);
+         else
+            return Collections.emptyList();
       }
 
       protected Class<DependencyItem> getComponentType()