[jboss-cvs] JBossAS SVN: r103667 - projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec.

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

Author: remy.maucherat at jboss.com
Date: 2010-04-07 19:28:52 -0400 (Wed, 07 Apr 2010)
New Revision: 103667

Modified:
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java
Log:
- Minor clarification: url-patterns override on matching names when doing a merge to web.xml, no need to redefine the corresponding servlet/filter.

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java	2010-04-07 23:26:39 UTC (rev 103666)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebCommonMetaData.java	2010-04-07 23:28:52 UTC (rev 103667)
@@ -610,11 +610,8 @@
                if (check.getFilterName().equals(filterMapping.getFilterName()))
                {
                   found = true;
-                  String filterName = check.getFilterName();
-                  // Augment unless the Filter has been redefined in the descriptor we are merging into
-                  if (!(resolveConflicts
-                        && getFilters() != null
-                        && getFilters().get(filterName) != null)) {
+                  // Augment unless an overriding descriptor redefines patterns
+                  if (!resolveConflicts) {
                      check.augment(filterMapping, null, resolveConflicts);
                   }
                }
@@ -828,11 +825,8 @@
                if (check.getServletName().equals(servletMapping.getServletName()))
                {
                   found = true;
-                  String servletName = check.getServletName();
-                  // Augment unless the Servlet has been redefined in the descriptor we are merging into
-                  if (!(resolveConflicts
-                        && getServlets() != null
-                        && getServlets().get(servletName) != null)) {
+                  // Augment unless an overriding descriptor redefines patterns
+                  if (!resolveConflicts) {
                      check.augment(servletMapping, null, resolveConflicts);
                   }
                }