This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1f1274b3e69bc621eba3564e1cb6fc7797a15df1
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 | 6 ++----
java/org/apache/catalina/session/StandardSession.java | 1 -
java/org/apache/catalina/webresources/JarContents.java | 5 ++---
java/org/apache/coyote/Request.java | 1 -
java/org/apache/tomcat/util/compat/Jre16Compat.java | 4 +++-
java/org/apache/tomcat/util/compat/JreCompat.java | 2 +-
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 +--
11 files changed, 11 insertions(+), 17 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 0d2c5ff..ff599aa 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -1828,7 +1828,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 baa34c2..b8e0f22 100644
--- a/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
+++ b/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
@@ -204,7 +204,6 @@ public class JreMemoryLeakPreventionListener implements
LifecycleListener {
}
-
@Override
public void lifecycleEvent(LifecycleEvent event) {
// Initialise these classes when Tomcat starts
@@ -231,8 +230,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(
@@ -248,7 +246,7 @@ public class JreMemoryLeakPreventionListener implements
LifecycleListener {
* - Batik
* - others TBD
*
- * Note tha a call to sun.awt.AppContext.getAppContext()
results
+ * Note that a call to sun.awt.AppContext.getAppContext()
results
* in a thread being started named AWT-AppKit that requires a
* graphical environment to be available.
*/
diff --git a/java/org/apache/catalina/session/StandardSession.java
b/java/org/apache/catalina/session/StandardSession.java
index 6b3ef4c..d1aa575 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/catalina/webresources/JarContents.java
b/java/org/apache/catalina/webresources/JarContents.java
index 0afa9fa..2718072 100644
--- a/java/org/apache/catalina/webresources/JarContents.java
+++ b/java/org/apache/catalina/webresources/JarContents.java
@@ -58,7 +58,6 @@ public final class JarContents {
bits1 = new BitSet(TABLE_SIZE);
bits2 = new BitSet(TABLE_SIZE);
- // Enumerations. When will they update this API?!
while (entries.hasMoreElements()) {
JarEntry entry = entries.nextElement();
String name = entry.getName();
@@ -140,9 +139,9 @@ public final class JarContents {
startPos++;
}
- // calculate the hash lazyly and return a boolean value for this path
+ // calculate the hash lazily and return a boolean value for this path
return (bits1.get(hashcode(path, startPos, HASH_PRIME_1) % TABLE_SIZE)
&&
bits2.get(hashcode(path, startPos, HASH_PRIME_2) %
TABLE_SIZE));
}
-}
\ No newline at end of file
+}
diff --git a/java/org/apache/coyote/Request.java
b/java/org/apache/coyote/Request.java
index 7032db6..328cb03 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();
private final Map<String,String> trailerFields = new HashMap<>();
-
/**
* Path parameters
*/
diff --git a/java/org/apache/tomcat/util/compat/Jre16Compat.java
b/java/org/apache/tomcat/util/compat/Jre16Compat.java
index 0b92c59..a014638 100644
--- a/java/org/apache/tomcat/util/compat/Jre16Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre16Compat.java
@@ -65,6 +65,7 @@ class Jre16Compat extends Jre9Compat {
return unixDomainSocketAddressClazz != null;
}
+
@Override
public SocketAddress getUnixDomainSocketAddress(String path) {
try {
@@ -75,6 +76,7 @@ class Jre16Compat extends Jre9Compat {
}
}
+
@Override
public ServerSocketChannel openUnixDomainServerSocketChannel() {
try {
@@ -85,6 +87,7 @@ class Jre16Compat extends Jre9Compat {
}
}
+
@Override
public SocketChannel openUnixDomainSocketChannel() {
try {
@@ -94,5 +97,4 @@ class Jre16Compat extends Jre9Compat {
throw new UnsupportedOperationException(e);
}
}
-
}
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 00f0fb7..62df145 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
@@ -321,6 +321,7 @@ public class JreCompat {
throw new
UnsupportedOperationException(sm.getString("jreCompat.noUnixDomainSocket"));
}
+
/**
* Create socket channel using the Unix domain socket ProtocolFamily.
* @return the socket channel
@@ -328,5 +329,4 @@ public class JreCompat {
public SocketChannel openUnixDomainSocketChannel() {
throw new
UnsupportedOperationException(sm.getString("jreCompat.noUnixDomainSocket"));
}
-
}
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 8040731..ed0b5af 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
@@ -196,6 +196,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 38af1c6..617ffde 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
