This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new d615134 Align with 9.0.x & 8.5.x
d615134 is described below
commit d61513411dee4bf2acdee5427384d058ca3a6cb9
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Dec 7 17:46:28 2020 +0000
Align with 9.0.x & 8.5.x
---
java/org/apache/catalina/filters/CsrfPreventionFilter.java | 2 ++
java/org/apache/catalina/loader/WebappClassLoaderBase.java | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
index f71c888..2392a6b 100644
--- a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
+++ b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
@@ -248,6 +248,8 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
/*
* Return the specified URL with the nonce added to the query string.
+ *
+ * @param url URL to be modified
*/
private String addNonce(String url) {
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 597769e..e105452 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -360,10 +360,10 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
/**
* Should Tomcat call
- * {@link org.apache.juli.logging.LogFactory#release(ClassLoader)}
- * when the class loader is stopped? If not specified, the default value
- * of <code>true</code> is used. Changing the default setting is likely to
- * lead to memory leaks and other issues.
+ * {@link org.apache.juli.logging.LogFactory#release(ClassLoader)} when the
+ * class loader is stopped? If not specified, the default value of
+ * <code>true</code> is used. Changing the default setting is likely to
lead
+ * to memory leaks and other issues.
*/
private boolean clearReferencesLogFactoryRelease = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
