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 94b96382fbb3160d134fefa9767ee64c58457722
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 24 12:14:31 2021 +0000
Align comments and spacing with 10.1.x
---
conf/server.xml | 3 +--
java/org/apache/catalina/connector/Request.java | 1 -
java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java | 4 +---
java/org/apache/catalina/session/StandardSession.java | 1 -
java/org/apache/coyote/Request.java | 1 -
java/org/apache/tomcat/util/descriptor/web/SessionConfig.java | 1 -
java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java | 1 +
res/rat/rat-excludes.txt | 3 +--
8 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/conf/server.xml b/conf/server.xml
index 5915407..1e8139d 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -79,8 +79,7 @@
<!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
This connector uses the NIO implementation. The default
SSLImplementation will depend on the presence of the APR/native
- library and the useOpenSSL attribute of the
- AprLifecycleListener.
+ library and the useOpenSSL attribute of the AprLifecycleListener.
Either JSSE or OpenSSL style configuration may be used regardless of
the SSLImplementation selected. JSSE style configuration is used
below.
-->
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 50d3174..6914b0e 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -1836,7 +1836,6 @@ public class Request implements HttpServletRequest {
// ---------------------------------------------------- HttpRequest Methods
-
/**
* Add a Cookie to the set of Cookies associated with this Request.
*
diff --git a/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
b/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
index 58f1382..314ebbc 100644
--- a/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
+++ b/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
@@ -229,7 +229,6 @@ public class JreMemoryLeakPreventionListener implements
LifecycleListener {
}
-
@Override
public void lifecycleEvent(LifecycleEvent event) {
// Initialise these classes when Tomcat starts
@@ -256,8 +255,7 @@ public class JreMemoryLeakPreventionListener implements
LifecycleListener {
ClassLoader loader =
Thread.currentThread().getContextClassLoader();
- try
- {
+ try {
// Use the system classloader as the victim for all this
// ClassLoader pinning we're about to do.
Thread.currentThread().setContextClassLoader(
diff --git a/java/org/apache/catalina/session/StandardSession.java
b/java/org/apache/catalina/session/StandardSession.java
index e7bdfeb..2d1f296 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -1132,7 +1132,6 @@ public class StandardSession implements HttpSession,
Session, Serializable {
// ----------------------------------------------HttpSession Public Methods
-
/**
* Return the object bound with the specified name in this session, or
* <code>null</code> if no object is bound with that name.
diff --git a/java/org/apache/coyote/Request.java
b/java/org/apache/coyote/Request.java
index 94c5d0f..b82856d 100644
--- a/java/org/apache/coyote/Request.java
+++ b/java/org/apache/coyote/Request.java
@@ -102,7 +102,6 @@ public final class Request {
private final MimeHeaders headers = new MimeHeaders();
-
/**
* Path parameters
*/
diff --git a/java/org/apache/tomcat/util/descriptor/web/SessionConfig.java
b/java/org/apache/tomcat/util/descriptor/web/SessionConfig.java
index 5c4d300..a282bd3 100644
--- a/java/org/apache/tomcat/util/descriptor/web/SessionConfig.java
+++ b/java/org/apache/tomcat/util/descriptor/web/SessionConfig.java
@@ -100,5 +100,4 @@ public class SessionConfig {
sessionTrackingModes.add(
SessionTrackingMode.valueOf(sessionTrackingMode));
}
-
}
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
index 807a79b..6d98744 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
@@ -198,6 +198,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
}
}
+
protected static boolean checkConf(OpenSSLConf conf, long cctx) throws
Exception {
boolean result = true;
OpenSSLConfCmd cmd;
diff --git a/res/rat/rat-excludes.txt b/res/rat/rat-excludes.txt
index a8e6be3..a033c97 100644
--- a/res/rat/rat-excludes.txt
+++ b/res/rat/rat-excludes.txt
@@ -27,8 +27,7 @@
- *.manifest, MANIFEST.MF JAR manifest files cannot contain license
- - package-list and script.js files in API documentation (javadoc) are
- generated
+ - Files in API documentation (javadoc) that are generated
- test files, such as trivial textual files containing only "OK' string,
files in unusual encodings or compressed files are also excluded.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
