This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new f691d30c7e Fix Javadoc error and 4 warnings
f691d30c7e is described below
commit f691d30c7ef5e7edb50ae7338e94e7909b3c62bf
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Sep 1 16:57:10 2026 +0100
Fix Javadoc error and 4 warnings
---
java/org/apache/catalina/authenticator/AuthenticatorBase.java | 5 +++++
.../catalina/tribes/membership/cloud/CloudMembershipProvider.java | 2 +-
java/org/apache/catalina/webresources/AbstractResource.java | 7 +++++++
.../tomcat/websocket/server/WsHttpSessionBindingListener.java | 6 ++++++
java/org/apache/tomcat/websocket/server/WsServerContainer.java | 7 +++++++
5 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index c095bc4068..738f1754fb 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -1539,6 +1539,11 @@ public abstract class AuthenticatorBase extends
ValveBase implements Authenticat
this.authenticated = authenticated;
}
+ /**
+ * Was the authentication successful?
+ *
+ * @return {@code true} if successful, otherwise {@code false}
+ */
public boolean getAuthenticated() {
return authenticated;
}
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
index 4a2d054367..b0ba470f2f 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
@@ -210,7 +210,7 @@ public abstract class CloudMembershipProvider extends
MembershipProviderBase imp
/**
* Fetch current cluster members from the cloud orchestration.
*
- * @return the member array, or {@null} if an error occurred
+ * @return the member array, or {@code null} if an error occurred
*/
protected abstract Member[] fetchMembers();
diff --git a/java/org/apache/catalina/webresources/AbstractResource.java
b/java/org/apache/catalina/webresources/AbstractResource.java
index 88f6f8c895..1b679aceca 100644
--- a/java/org/apache/catalina/webresources/AbstractResource.java
+++ b/java/org/apache/catalina/webresources/AbstractResource.java
@@ -230,6 +230,13 @@ public abstract class AbstractResource implements
WebResource {
protected abstract Log getLog();
+ /**
+ * Gets the creation time for the given file
+ *
+ * @param file The file for which the creation time is required
+ *
+ * @return The creation time or, if not available the value of {@link
File#lastModified()}
+ */
protected long getCreation(File file) {
try {
BasicFileAttributes attrs = Files.readAttributes(file.toPath(),
BasicFileAttributes.class);
diff --git
a/java/org/apache/tomcat/websocket/server/WsHttpSessionBindingListener.java
b/java/org/apache/tomcat/websocket/server/WsHttpSessionBindingListener.java
index adefa660fa..2170f0d32d 100644
--- a/java/org/apache/tomcat/websocket/server/WsHttpSessionBindingListener.java
+++ b/java/org/apache/tomcat/websocket/server/WsHttpSessionBindingListener.java
@@ -22,6 +22,12 @@ import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpSessionBindingEvent;
import jakarta.servlet.http.HttpSessionBindingListener;
+/**
+ * Listener used to track when an HTTP session expires and notifies the
WebSocket container so any associated WebSocket
+ * session can be closed.
+ *
+ * @param key The key that identifies the HTTP session
+ */
public record WsHttpSessionBindingListener(String key) implements
HttpSessionBindingListener, Serializable {
@Override
diff --git a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
index aa332bec79..6a30452b2c 100644
--- a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
+++ b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
@@ -350,6 +350,13 @@ public class WsServerContainer extends
WsWebSocketContainer implements ServerCon
}
+ /**
+ * Register the link between the HTTP session and WebSocket session if the
HTTP session is authenticated.
+ *
+ * @param key The key to use to identify the HTTP session (session
IDs can change)
+ * @param wsSession The WebSocket session
+ * @param httpSession The HTTP session
+ */
protected void registerSession(Object key, WsSession wsSession, Object
httpSession) {
super.registerSession(key, wsSession);
if (wsSession.isOpen() && wsSession.getUserPrincipal() != null &&
httpSession != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
