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:06 UTC
[tomcat] branch 8.5.x updated (b911432 -> 2b31bed)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from b911432 clean-up
new cb7bc37 Correct Javadoc comment
new 2b31bed Clean-up. Align with 9.0.x
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/core/ContainerBase.java | 4 ++--
java/org/apache/catalina/core/StandardContext.java | 10 +++-------
2 files changed, 5 insertions(+), 9 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Clean-up. Align with 9.0.x
Posted by ma...@apache.org.
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
[tomcat] 01/02: Correct Javadoc comment
Posted by ma...@apache.org.
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 cb7bc377100c4a1a06a0da9280a1bb9c42b41290
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 17 10:21:41 2020 +0000
Correct Javadoc comment
---
java/org/apache/catalina/core/ContainerBase.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/ContainerBase.java b/java/org/apache/catalina/core/ContainerBase.java
index adc458b..4668c1a 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -1331,7 +1331,7 @@ public abstract class ContainerBase extends LifecycleMBeanBase
// -------------------------------------- ContainerExecuteDelay Inner Class
/**
- * Private thread class to invoke the backgroundProcess method
+ * Private runnable class to invoke the backgroundProcess method
* of this container and its children after a fixed delay.
*/
protected class ContainerBackgroundProcessor implements Runnable {
@@ -1397,7 +1397,7 @@ public abstract class ContainerBase extends LifecycleMBeanBase
}
- // ----------------------------- Inner classes used with start/stop Executor
+ // ---------------------------- Inner classes used with start/stop Executor
private static class StartChild implements Callable<Void> {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org