Author: kkolinko
Date: Wed Jan 12 05:23:49 2011
New Revision: 1057990
URL: http://svn.apache.org/viewvc?rev=1057990&view=rev
Log:
Additional improvements for
https://issues.apache.org/bugzilla/show_bug.cgi?id=50205
Followup to r1057788
1) Simplify check for absence of value
2) Reuse Matcher instance across iterations
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1057990&r1=1057989&r2=1057990&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Wed Jan 12
05:23:49 2011
@@ -36,6 +36,7 @@ import java.util.Locale;
import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
+import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.management.ObjectName;
@@ -482,15 +483,20 @@ public class HostConfig
* @return The filtered list of application paths
*/
protected String[] filterAppPaths(String[] unfilteredAppPaths) {
- if (host.getDeployIgnore() == null) {
+ Pattern filter = host.getDeployIgnorePattern();
+ if (filter == null) {
return unfilteredAppPaths;
}
-
- Pattern filter = host.getDeployIgnorePattern();
List<String> filteredList = new ArrayList<String>();
+ Matcher matcher = null;
for (String appPath : unfilteredAppPaths) {
- if (filter.matcher(appPath).matches()) {
+ if (matcher == null) {
+ matcher = filter.matcher(appPath);
+ } else {
+ matcher.reset(appPath);
+ }
+ if (matcher.matches()) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("hostConfig.ignorePath", appPath));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
