Author: markt
Date: Tue Jun 19 10:47:44 2018
New Revision: 1833810
URL: http://svn.apache.org/viewvc?rev=1833810&view=rev
Log:
Fix some Javadoc warnings
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/MapperListener.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityUtil.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELParser.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspReader.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/el/JasperELResolver.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Tue Jun 19 10:47:44 2018
@@ -203,7 +203,7 @@ public class JreMemoryLeakPreventionList
}
/**
- * {@link ForkJoinPool#commonPool()} creates a thread pool that, by
default,
+ * {@link ForkJoinPool} creates a thread pool that, by default,
* creates threads that retain references to the thread context class
* loader.
*/
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
Tue Jun 19 10:47:44 2018
@@ -173,7 +173,6 @@ public class CsrfPreventionFilter extend
* Return the specified URL with the nonce added to the query string.
*
* @param url URL to be modified
- * @param nonce The nonce to add
*/
private String addNonce(String url) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Tue Jun 19 10:47:44 2018
@@ -352,10 +352,11 @@ public abstract class WebappClassLoaderB
private boolean clearReferencesStopTimerThreads = false;
/**
- * Should Tomcat call {@link org.apache.juli.logging.LogFactory#release()}
- * 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.
+ * 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.
*/
private boolean clearReferencesLogFactoryRelease = true;
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/MapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/MapperListener.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/MapperListener.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/MapperListener.java
Tue Jun 19 10:47:44 2018
@@ -454,7 +454,7 @@ public class MapperListener extends Life
*
* @param context
* @param wrapper
- * @param list
+ * @param wrappers
*/
private void prepareWrapperMappingInfo(Context context, Wrapper wrapper,
List<WrapperMappingInfo> wrappers) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityUtil.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityUtil.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityUtil.java
Tue Jun 19 10:47:44 2018
@@ -258,7 +258,7 @@ public final class SecurityUtil{
* Perform work as a particular <code>Subject</code>. Here the work
* will be granted to a <code>null</code> subject.
*
- * @param methodName the method to apply the security restriction
+ * @param method the method to apply the security restriction
* @param targetObject the <code>Servlet</code> on which the method will
* be called.
* @param targetArguments <code>Object</code> array contains the
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Tue Jun 19 10:47:44 2018
@@ -1959,7 +1959,6 @@ public class WebdavServlet extends Defau
* Propfind helper method.
*
* @param req The servlet request
- * @param resources Resources object associated with this context
* @param generatedXML XML response to the Propfind request
* @param path Path of the current resource
* @param type Propfind type
@@ -2002,7 +2001,7 @@ public class WebdavServlet extends Defau
/**
* Propfind helper method. Displays the properties of a lock-null resource.
*
- * @param resources Resources object associated with this context
+ * @param req The servlet request
* @param generatedXML XML response to the Propfind request
* @param path Path of the current resource
* @param type Propfind type
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Jun
19 10:47:44 2018
@@ -1274,7 +1274,7 @@ public class AjpProcessor extends Abstra
/**
* @deprecated Unused. Will be removed in Tomcat 9. Use
- * {@link #doWrite(ByteBuffer)}
+ * {@link #writeData(ByteBuffer)}
*/
@Deprecated
private void writeData(ByteChunk chunk) throws IOException {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELParser.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELParser.java Tue Jun
19 10:47:44 2018
@@ -274,7 +274,6 @@ public class ELParser {
* {@link #skipUntilEL()}.
*
* @param input Non-EL input to be escaped
- * @param isDeferredSyntaxAllowedAsLiteral
*
* @return The escaped version of the input
*/
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspReader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspReader.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspReader.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspReader.java Tue Jun
19 10:47:44 2018
@@ -400,7 +400,7 @@ class JspReader {
* Skip until the given string is matched in the stream.
* When returned, the context is positioned past the end of the match.
*
- * @param s The String to match.
+ * @param limit The String to match.
* @return A non-null <code>Mark</code> instance (positioned immediately
* before the search string) if found, <strong>null</strong>
* otherwise.
@@ -439,7 +439,7 @@ class JspReader {
* chars initially escaped by a '\' and any EL expressions.
* When returned, the context is positioned past the end of the match.
*
- * @param s The String to match.
+ * @param limit The String to match.
* @param ignoreEL <code>true</code> if something that looks like EL should
* not be treated as EL.
* @return A non-null <code>Mark</code> instance (positioned immediately
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/el/JasperELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/el/JasperELResolver.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/el/JasperELResolver.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/el/JasperELResolver.java Tue
Jun 19 10:47:44 2018
@@ -155,7 +155,7 @@ public class JasperELResolver extends Co
}
/**
- * Copied from {@link org.apache.el.lang.ELSupport#coerceToString(Object)}.
+ * Copied from {@link
org.apache.el.lang.ELSupport#coerceToString(ELContext,Object)}.
*/
private static final String coerceToString(final Object obj) {
if (obj == null) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
Tue Jun 19 10:47:44 2018
@@ -36,7 +36,7 @@ public final class ConstantLong extends
/**
* Initialize instance from file data.
*
- * @param file Input stream
+ * @param input Input stream
* @throws IOException
*/
ConstantLong(final DataInput input) throws IOException {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
Tue Jun 19 10:47:44 2018
@@ -40,7 +40,7 @@ public class JavaClass {
* @param superclass_name Name of this class's superclass.
* @param access_flags Access rights defined by bit flags
* @param constant_pool Array of constants
- * @param interfaces Implemented interfaces
+ * @param interface_names Implemented interfaces
* @param runtimeVisibleAnnotations "RuntimeVisibleAnnotations" attribute
defined on the Class, or null
*/
JavaClass(final String class_name, final String superclass_name,
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
Tue Jun 19 10:47:44 2018
@@ -63,8 +63,6 @@ public class IOUtils {
/**
* The default buffer size ({@value}) to use for
* {@link #copyLarge(InputStream, OutputStream)}
- * and
- * {@link #copyLarge(Reader, Writer)}
*/
private static final int DEFAULT_BUFFER_SIZE = 1024 * 4;
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java
Tue Jun 19 10:47:44 2018
@@ -623,7 +623,7 @@ public class Cookie {
/**
* Custom implementation that skips many of the safety checks in
- * {@link javax.nio.ByteBuffer}.
+ * {@link java.nio.ByteBuffer}.
*/
private static class ByteBuffer {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
Tue Jun 19 10:47:44 2018
@@ -173,7 +173,7 @@ public final class OpenSSLEngine extends
* @param fallbackApplicationProtocol the fallback application protocol
* @param clientMode {@code true} if this is used for clients, {@code
false}
* otherwise
- * @param sessionContext the {@link OpenSslSessionContext} this
+ * @param sessionContext the {@link OpenSSLSessionContext} this
* {@link SSLEngine} belongs to.
* @param alpn {@code true} if alpn should be used, {@code false}
* otherwise
@@ -192,7 +192,7 @@ public final class OpenSSLEngine extends
* @param fallbackApplicationProtocol the fallback application protocol
* @param clientMode {@code true} if this is used for clients, {@code
false}
* otherwise
- * @param sessionContext the {@link OpenSslSessionContext} this
+ * @param sessionContext the {@link OpenSSLSessionContext} this
* {@link SSLEngine} belongs to.
* @param alpn {@code true} if alpn should be used, {@code false}
* otherwise
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TesterServletEncodeUrl.java?rev=1833810&r1=1833809&r2=1833810&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
Tue Jun 19 10:47:44 2018
@@ -34,10 +34,10 @@ public class TesterServletEncodeUrl exte
/**
* Almost minimal processing for a servlet.
- *
- * @param nextUrl The url the caller would like to go to next. If
- * supplied, put an encoded url into the returned
- * html page as a hyperlink.
+ * <p>
+ * The request parameter <code>nextUrl</code> specifies the url to which
the
+ * caller would like to go next. If supplied, put an encoded url into the
+ * returned html page as a hyperlink.
*/
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
