From 2572fbff78b718eb497e7684f5ee4e73bc6279bd Mon Sep 17 00:00:00 2001 From: maxcooper Date: Thu, 2 Jan 2003 19:21:28 +0000 Subject: [PATCH] bug #661261: improper sorting of EXACT patterns --- .../org/securityfilter/filter/URLPattern.java | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/share/org/securityfilter/filter/URLPattern.java b/src/share/org/securityfilter/filter/URLPattern.java index 940c1da..83f325f 100644 --- a/src/share/org/securityfilter/filter/URLPattern.java +++ b/src/share/org/securityfilter/filter/URLPattern.java @@ -1,7 +1,7 @@ /* - * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/filter/URLPattern.java,v 1.1 2002/12/17 15:10:00 maxcooper Exp $ - * $Revision: 1.1 $ - * $Date: 2002/12/17 15:10:00 $ + * $Header: /cvsroot/securityfilter/securityfilter/src/share/org/securityfilter/filter/URLPattern.java,v 1.2 2003/01/02 19:21:28 maxcooper Exp $ + * $Revision: 1.2 $ + * $Date: 2003/01/02 19:21:28 $ * * ==================================================================== * The SecurityFilter Software License, Version 1.1 @@ -67,22 +67,23 @@ import org.securityfilter.config.WebResourceCollection; * Also supports sorting according to the Servlet Spec v2.3. * * @author Max Cooper (max@maxcooper.com) - * @version $Revision: 1.1 $ $Date: 2002/12/17 15:10:00 $ + * @version $Revision: 1.2 $ $Date: 2003/01/02 19:21:28 $ */ public class URLPattern implements Comparable { /** - * Pattern type for PATH_TYPE mappings. Starts with '/' and ends with '/*'. + * Pattern type for patterns that do not meet the PATH_TYPE + * or EXTENSION_TYPE pattern type specifications. */ - public static final int PATH_TYPE = 1; + public static final int EXACT_TYPE = 1; /** - * Pattern type for EXTENSION_TYPE mappings. Starts with *. + * Pattern type for PATH_TYPE mappings. Starts with '/' and ends with '/*'. */ - public static final int EXTENSION_TYPE = 2; + public static final int PATH_TYPE = 2; /** - * Pattern type for patterns that do not meet the PATH_TYPE - * or EXTENSION_TYPE pattern type specifications. + * Pattern type for EXTENSION_TYPE mappings. Starts with '*.' */ - public static final int EXACT_TYPE = 3; + public static final int EXTENSION_TYPE = 3; + protected String pattern; protected String convertedPattern; -- 2.11.0