Author: markt Date: Sun Aug 26 22:30:59 2012 New Revision: 1377536 URL: http://svn.apache.org/viewvc?rev=1377536&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53758 Fix Dynamic Filter Registration mapping logic inverted
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1377535 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java?rev=1377536&r1=1377535&r2=1377536&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java Sun Aug 26 22:30:59 2012 @@ -72,9 +72,9 @@ public class ApplicationFilterRegistrati } if (isMatchAfter) { - context.addFilterMapBefore(filterMap); - } else { context.addFilterMap(filterMap); + } else { + context.addFilterMapBefore(filterMap); } } // else error? @@ -101,9 +101,9 @@ public class ApplicationFilterRegistrati } if (isMatchAfter) { - context.addFilterMapBefore(filterMap); - } else { context.addFilterMap(filterMap); + } else { + context.addFilterMapBefore(filterMap); } } // else error? 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=1377536&r1=1377535&r2=1377536&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Aug 26 22:30:59 2012 @@ -162,6 +162,12 @@ Fix typos etc. in the code that logs merged web.xml (as enabled by <code>logEffectiveWebXml</code> option on Context). (kkolinko) </fix> + <fix> + <bug>53758</bug>: When adding filters via + <code>FilterRegistration.Dynamic</code> the filters were added at the + wrong point because the <code>isMatchAfter </code> logic was inverted. + (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org