From 766875e9e068812b1d26aaf17b86cb00b2038ddf Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 11 Nov 2010 10:14:21 +0000 Subject: [PATCH] Simpler code / fix Eclipse warnings git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1033867 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/catalina/filters/RequestFilter.java | 38 +++++++++------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/java/org/apache/catalina/filters/RequestFilter.java b/java/org/apache/catalina/filters/RequestFilter.java index bd0bf06ee..7588b9802 100644 --- a/java/org/apache/catalina/filters/RequestFilter.java +++ b/java/org/apache/catalina/filters/RequestFilter.java @@ -196,31 +196,25 @@ public abstract class RequestFilter if (list == null) return (new Pattern[0]); - list = list.trim(); - if (list.length() < 1) - return (new Pattern[0]); - list += ","; - - ArrayList reList = new ArrayList(); - while (list.length() > 0) { - int comma = list.indexOf(','); - if (comma < 0) - break; - String pattern = list.substring(0, comma).trim(); - try { - reList.add(Pattern.compile(pattern)); - } catch (PatternSyntaxException e) { - IllegalArgumentException iae = new IllegalArgumentException - (sm.getString("requestFilterFilter.syntax", pattern)); - iae.initCause(e); - throw iae; + + ArrayList result = new ArrayList(); + + String[] patterns = list.split(","); + for (String pattern : patterns) { + pattern = pattern.trim(); + if (pattern.length() > 0) { + try { + result.add(Pattern.compile(pattern)); + } catch (PatternSyntaxException e) { + IllegalArgumentException iae = new IllegalArgumentException + (sm.getString("requestFilterFilter.syntax", pattern)); + iae.initCause(e); + throw iae; + } } - list = list.substring(comma + 1); } - Pattern reArray[] = new Pattern[reList.size()]; - return reList.toArray(reArray); - + return result.toArray(new Pattern[result.size()]); } -- 2.11.0