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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 030078d9fd Align with 10.0.x
030078d9fd is described below
commit 030078d9fd7dd0cab27d173c5cb583a106a1eb00
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 27 09:35:40 2023 +0000
Align with 10.0.x
---
java/org/apache/catalina/authenticator/Constants.java | 1 -
.../authenticator/jaspic/PersistentProviderRegistrations.java | 7 +++++++
java/org/apache/catalina/core/ApplicationContextFacade.java | 1 -
java/org/apache/catalina/core/AprStatus.java | 2 +-
java/org/apache/catalina/core/ContainerBase.java | 1 -
java/org/apache/catalina/core/StandardEngine.java | 6 +-----
java/org/apache/catalina/core/StandardWrapper.java | 1 -
7 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/Constants.java
b/java/org/apache/catalina/authenticator/Constants.java
index b6bfd8f914..983528a9d4 100644
--- a/java/org/apache/catalina/authenticator/Constants.java
+++ b/java/org/apache/catalina/authenticator/Constants.java
@@ -17,7 +17,6 @@
package org.apache.catalina.authenticator;
public class Constants {
-
// Authentication methods for login configuration
// Servlet spec schemes are defined in HttpServletRequest
// Vendor specific schemes
diff --git
a/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
b/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
index de305d32c3..b53310574e 100644
---
a/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
+++
b/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
@@ -237,6 +237,13 @@ public final class PersistentProviderRegistrations {
public void addProperty(Property property) {
properties.put(property.getName(), property.getValue());
}
+
+ /**
+ * Used by IntrospectionUtils via reflection.
+ * @param name - the name of of the property to set on this object
+ * @param value - the value to set
+ * @see #addProperty(String, String)
+ */
public void setProperty(String name, String value) {
addProperty(name, value);
}
diff --git a/java/org/apache/catalina/core/ApplicationContextFacade.java
b/java/org/apache/catalina/core/ApplicationContextFacade.java
index 0a9b49a80f..709f3568d4 100644
--- a/java/org/apache/catalina/core/ApplicationContextFacade.java
+++ b/java/org/apache/catalina/core/ApplicationContextFacade.java
@@ -71,7 +71,6 @@ public class ApplicationContextFacade implements
ServletContext {
// ----------------------------------------------------------- Constructors
-
/**
* Construct a new instance of this class, associated with the specified
Context instance.
*
diff --git a/java/org/apache/catalina/core/AprStatus.java
b/java/org/apache/catalina/core/AprStatus.java
index 38aaa6d0ae..a3b82ba720 100644
--- a/java/org/apache/catalina/core/AprStatus.java
+++ b/java/org/apache/catalina/core/AprStatus.java
@@ -17,7 +17,7 @@
package org.apache.catalina.core;
/**
- * Holds APR status.
+ * Holds APR status without the need to load other classes.
*/
public class AprStatus {
private static volatile boolean aprInitialized = false;
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index e164927c74..175cec0dba 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -148,7 +148,6 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
// ----------------------------------------------------- Instance Variables
-
/**
* The child Containers belonging to this Container, keyed by name.
*/
diff --git a/java/org/apache/catalina/core/StandardEngine.java
b/java/org/apache/catalina/core/StandardEngine.java
index 9996a8d21c..ae99f77863 100644
--- a/java/org/apache/catalina/core/StandardEngine.java
+++ b/java/org/apache/catalina/core/StandardEngine.java
@@ -55,15 +55,13 @@ public class StandardEngine extends ContainerBase
implements Engine {
private static final Log log = LogFactory.getLog(StandardEngine.class);
- // ----------------------------------------------------------- Constructors
+ // ----------------------------------------------------------- Constructors
/**
* Create a new StandardEngine component with the default basic Valve.
*/
public StandardEngine() {
-
- super();
pipeline.setBasic(new StandardEngineValve());
/* Set the jvmRoute using the system property jvmRoute */
try {
@@ -73,13 +71,11 @@ public class StandardEngine extends ContainerBase
implements Engine {
}
// By default, the engine will hold the reloading thread
backgroundProcessorDelay = 10;
-
}
// ----------------------------------------------------- Instance Variables
-
/**
* Host name to use when no server host, or an unknown host, is specified
in the request.
*/
diff --git a/java/org/apache/catalina/core/StandardWrapper.java
b/java/org/apache/catalina/core/StandardWrapper.java
index 580e668672..81149ec306 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -1334,7 +1334,6 @@ public class StandardWrapper extends ContainerBase
implements ServletConfig, Wra
unloading = false;
fireContainerEvent("unload", this);
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
