[jboss-cvs] JBossAS SVN: r110198 - trunk/server/src/main/java/org/jboss/web/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2010-12-23 15:17:57 -0500 (Thu, 23 Dec 2010)
New Revision: 110198

Modified:
   trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
Log:
JBAS-8767: No exception when a unknown fragment name is specified in the ordering.

Modified: trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2010-12-23 19:14:33 UTC (rev 110197)
+++ trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2010-12-23 20:17:57 UTC (rev 110198)
@@ -21,7 +21,6 @@
  */
 package org.jboss.web.deployers;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -277,18 +276,14 @@
             }
             else
             {
-               boolean found = false; 
                for (WebOrdering ordering : orderings)
                {
                   if (orderingElementMetaData.getName().equals(ordering.getName())) {
                      order.add(ordering.getJar());
                      jarsSet.remove(ordering.getJar());
-                     found = true;
                      break;
                   }
                }
-               if (!found)
-                  throw new DeploymentException("Could not resolve name in absolute ordering: " + orderingElementMetaData.getName()); 
             }
             i++;
          }
@@ -705,11 +700,6 @@
                       found = true;
                   }
               }
-              if (!found) {
-                  // Unknown name
-                  //throw new IllegalStateException(sm.getString("ordering.unkonwnName", webOrdering.getJar()));
-                 throw new IllegalStateException("Unknown name declared in JAR: " + webOrdering.getJar());
-              }
           }
           Iterator<String> before = webOrdering.getBefore().iterator();
           while (before.hasNext()) {
@@ -729,11 +719,6 @@
                       found = true;
                   }
               }
-              if (!found) {
-                  // Unknown name
-                  //throw new IllegalStateException(sm.getString("ordering.unkonwnName", webOrdering.getJar()));
-                 throw new IllegalStateException("Unknown name declared in JAR: " + webOrdering.getJar());
-              }
           }
       }