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 2020/02/17 11:20:08 UTC
[tomcat] 02/02: Clean-up. Align with 9.0.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2b31bed3a0951f77a5fae77e8fcf7e26ffa3ee7a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 17 11:11:36 2020 +0000
Clean-up. Align with 9.0.x
---
java/org/apache/catalina/core/StandardContext.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 80e6558..24a5296 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -3610,13 +3610,10 @@ public class StandardContext extends ContainerBase
*/
@Override
public String[] findServletMappings() {
-
synchronized (servletMappingsLock) {
String results[] = new String[servletMappings.size()];
- return
- (servletMappings.keySet().toArray(results));
+ return servletMappings.keySet().toArray(results);
}
-
}
@@ -5084,7 +5081,7 @@ public class StandardContext extends ContainerBase
Boolean.valueOf((getCluster() != null)),
Boolean.valueOf(distributable)));
}
- if ( (getCluster() != null) && distributable) {
+ if ((getCluster() != null) && distributable) {
try {
contextManager = getCluster().createManager(getName());
} catch (Exception ex) {
@@ -6129,8 +6126,7 @@ public class StandardContext extends ContainerBase
} else
return false;
}
- if ( (urlPattern.startsWith("/")) &&
- (urlPattern.indexOf("*.") < 0)) {
+ if (urlPattern.startsWith("/") && !urlPattern.contains("*.")) {
checkUnusualURLPattern(urlPattern);
return true;
} else
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org