Author: remy.maucherat(a)jboss.com Date: 2009-11-06 12:08:04 -0500 (Fri, 06 Nov 2009) New Revision: 1250 Modified: trunk/java/org/apache/catalina/connector/Request.java trunk/java/org/apache/catalina/core/StandardWrapperFacade.java Log: - Add missing useAttributes. - If some URLs conflict, should do nothing. Modified: trunk/java/org/apache/catalina/connector/Request.java =================================================================== --- trunk/java/org/apache/catalina/connector/Request.java 2009-11-06 14:48:00 UTC (rev 1249) +++ trunk/java/org/apache/catalina/connector/Request.java 2009-11-06 17:08:04 UTC (rev 1250) @@ -3232,6 +3232,7 @@ public void dispatch(ServletContext servletContext, String path) { this.servletContext = servletContext; this.path = path; + useAttributes = true; resume(); } Modified: trunk/java/org/apache/catalina/core/StandardWrapperFacade.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardWrapperFacade.java 2009-11-06 14:48:00 UTC (rev 1249) +++ trunk/java/org/apache/catalina/core/StandardWrapperFacade.java 2009-11-06 17:08:04 UTC (rev 1250) @@ -164,7 +164,10 @@ for (String urlPattern : urlPatterns) { if (((Context) wrapper.getParent()).findServletMapping(urlPattern) != null) { conflicts.add(urlPattern); - } else { + } + } + if (conflicts.isEmpty()) { + for (String urlPattern : urlPatterns) { ((Context) wrapper.getParent()).addServletMapping(urlPattern, wrapper.getName()); } }