Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 939BE9037 for ; Sun, 3 Jun 2012 21:18:51 +0000 (UTC) Received: (qmail 7462 invoked by uid 500); 3 Jun 2012 21:18:50 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 7391 invoked by uid 500); 3 Jun 2012 21:18:50 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 7382 invoked by uid 99); 3 Jun 2012 21:18:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jun 2012 21:18:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jun 2012 21:18:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 93CD82388847 for ; Sun, 3 Jun 2012 21:18:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1345782 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml Date: Sun, 03 Jun 2012 21:18:27 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120603211827.93CD82388847@eris.apache.org> Author: markt Date: Sun Jun 3 21:18:26 2012 New Revision: 1345782 URL: http://svn.apache.org/viewvc?rev=1345782&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53354 Don't add empty filter mappings to the set of mappings - they'll fail validation Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1345781 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1345782&r1=1345781&r2=1345782&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java Sun Jun 3 21:18:26 2012 @@ -2383,6 +2383,7 @@ public class ContextConfig implements Li } boolean urlPatternsSet = false; + boolean servletNamesSet = false; boolean dispatchTypesSet = false; String[] urlPatterns = null; @@ -2401,6 +2402,7 @@ public class ContextConfig implements Li } else if ("servletNames".equals(name)) { String[] servletNames = processAnnotationsStringArray(evp .getValue()); + servletNamesSet = servletNames.length > 0; for (String servletName : servletNames) { filterMap.addServletName(servletName); } @@ -2457,8 +2459,10 @@ public class ContextConfig implements Li } if (!isWebXMLfilterDef) { fragment.addFilter(filterDef); - filterMap.setFilterName(filterName); - fragment.addFilterMapping(filterMap); + if (urlPatternsSet || servletNamesSet) { + filterMap.setFilterName(filterName); + fragment.addFilterMapping(filterMap); + } } if (urlPatternsSet || dispatchTypesSet) { Set fmap = fragment.getFilterMappings(); Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1345782&r1=1345781&r2=1345782&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Jun 3 21:18:26 2012 @@ -202,6 +202,10 @@ Content-Type values that contain invalid parameters by ignoring the invalid parameters. (markt) + + 53354: Correctly handle @WebFilter annotations + that do not include a mapping. (markt) + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org