This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 79c157e11c Align with 11.0.x
79c157e11c is described below
commit 79c157e11ccf0e51e6576451ececd359be408650
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Jan 13 13:08:10 2023 +0000
Align with 11.0.x
---
java/org/apache/catalina/loader/WebappLoader.java | 2 +-
java/org/apache/catalina/startup/WebAnnotationSet.java | 1 +
java/org/apache/catalina/tribes/util/TcclThreadFactory.java | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappLoader.java
b/java/org/apache/catalina/loader/WebappLoader.java
index ae4f58523d..76d87b00a4 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -64,7 +64,7 @@ import org.apache.tomcat.util.res.StringManager;
* @author Craig R. McClanahan
* @author Remy Maucherat
*/
-public class WebappLoader extends LifecycleMBeanBase implements Loader{
+public class WebappLoader extends LifecycleMBeanBase implements Loader {
private static final Log log = LogFactory.getLog(WebappLoader.class);
diff --git a/java/org/apache/catalina/startup/WebAnnotationSet.java
b/java/org/apache/catalina/startup/WebAnnotationSet.java
index 8d0073b7b3..b05ecf2c26 100644
--- a/java/org/apache/catalina/startup/WebAnnotationSet.java
+++ b/java/org/apache/catalina/startup/WebAnnotationSet.java
@@ -251,6 +251,7 @@ public class WebAnnotationSet {
}
}
*/
+
/* Process DeclareRoles annotation.
* Ref JSR 250, equivalent to the security-role element in
* the deployment descriptor
diff --git a/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
b/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
index de46faa62b..052d3ea51c 100644
--- a/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
+++ b/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
@@ -66,5 +66,4 @@ public class TcclThreadFactory implements ThreadFactory {
t.setDaemon(true);
return t;
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
