[jboss-cvs] JBossAS SVN: r93527 - projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers.

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

Author: alesj
Date: 2009-09-15 07:50:41 -0400 (Tue, 15 Sep 2009)
New Revision: 93527

Modified:
   projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractAllInputDeployer.java
Log:
[JBDEPLOY-213]; fix all input deployer

Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractAllInputDeployer.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractAllInputDeployer.java	2009-09-15 11:43:33 UTC (rev 93526)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractAllInputDeployer.java	2009-09-15 11:50:41 UTC (rev 93527)
@@ -50,7 +50,7 @@
       {
          for (String input : inputs)
          {
-            if (optionalInputs.contains(input) == false && unit.isAttachmentPresent(input) == false)
+            if ((optionalInputs == null || optionalInputs.contains(input) == false) && unit.isAttachmentPresent(input) == false)
             {
                return false;
             }
@@ -116,6 +116,9 @@
       if (input == null)
          throw new IllegalArgumentException("Null input");
 
+      if (optionalInputs == null)
+         optionalInputs = CollectionsFactory.createLazySet();
+
       optionalInputs.add(input);
       addInput(input);
    }
@@ -127,6 +130,14 @@
     */
    public void setOptionalInputs(Set<String> optionalInputs)
    {
-      this.optionalInputs = optionalInputs;
+      if (optionalInputs != null)
+      {
+         for (String input : optionalInputs)
+            addOptionalInput(input);
+      }
+      else
+      {
+         this.optionalInputs = optionalInputs;
+      }
    }
 }