You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/11/11 11:14:22 UTC
svn commit: r1033867 -
/tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java
Author: markt
Date: Thu Nov 11 10:14:21 2010
New Revision: 1033867
URL: http://svn.apache.org/viewvc?rev=1033867&view=rev
Log:
Simpler code / fix Eclipse warnings
Modified:
tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java
Modified: tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java?rev=1033867&r1=1033866&r2=1033867&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java Thu Nov 11 10:14:21 2010
@@ -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<Pattern> reList = new ArrayList<Pattern>();
- 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<Pattern> result = new ArrayList<Pattern>();
+
+ 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()]);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org