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
The following commit(s) were added to refs/heads/8.5.x by this push:
new f2b1280 No functional change. Align 10.0.x, 9.0.x and 8.5.x
f2b1280 is described below
commit f2b1280ca1a31aa96353c8646da8dae72f52c47f
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Mar 29 14:02:15 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/catalina/Globals.java | 1 -
java/org/apache/catalina/Loader.java | 8 ++++++++
java/org/apache/catalina/TomcatPrincipal.java | 1 -
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/Globals.java
b/java/org/apache/catalina/Globals.java
index 52a9f96..f1d2815 100644
--- a/java/org/apache/catalina/Globals.java
+++ b/java/org/apache/catalina/Globals.java
@@ -95,7 +95,6 @@ public final class Globals {
/**
- * The subject under which the AccessControlContext is running.
* The request attribute that is set to the value of {@code Boolean.TRUE}
* by the RemoteIpFilter, RemoteIpValve (and other similar components)
that identifies
* a request which been forwarded via one or more proxies.
diff --git a/java/org/apache/catalina/Loader.java
b/java/org/apache/catalina/Loader.java
index dfe2461..b14deb5 100644
--- a/java/org/apache/catalina/Loader.java
+++ b/java/org/apache/catalina/Loader.java
@@ -96,7 +96,11 @@ public interface Loader {
/**
* @return the reloadable flag for this Loader.
+ *
+ * @deprecated Use {@link Context#getReloadable()}. This method will be
+ * removed in Tomcat 10.
*/
+ @Deprecated
public boolean getReloadable();
@@ -104,7 +108,11 @@ public interface Loader {
* Set the reloadable flag for this Loader.
*
* @param reloadable The new reloadable flag
+ *
+ * @deprecated Use {@link Context#setReloadable(boolean)}. This method will
+ * be removed in Tomcat 10.
*/
+ @Deprecated
public void setReloadable(boolean reloadable);
diff --git a/java/org/apache/catalina/TomcatPrincipal.java
b/java/org/apache/catalina/TomcatPrincipal.java
index 4d5dad6..6a5ffae 100644
--- a/java/org/apache/catalina/TomcatPrincipal.java
+++ b/java/org/apache/catalina/TomcatPrincipal.java
@@ -44,7 +44,6 @@ public interface TomcatPrincipal extends Principal {
* to allow for future expansion of this method to cover
* other logout mechanisms that might throw a different
* exception to LoginContext
- *
*/
void logout() throws Exception;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
