Author: markt
Date: Wed May 23 14:47:45 2018
New Revision: 1832108
URL: http://svn.apache.org/viewvc?rev=1832108&view=rev
Log:
Fix some Javadoc errors reported by Eclipse.
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java
tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java
tomcat/trunk/java/org/apache/jasper/el/JasperELResolver.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
tomcat/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
tomcat/trunk/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Wed May 23
14:47:45 2018
@@ -193,8 +193,6 @@ public class CorsFilter extends GenericF
* This method returns the parameter's value if it exists, or defaultValue
* if not.
*
- * @param filterConfig The configuration for the filter
- *
* @param name The parameter's name
*
* @param defaultValue The default value to return if the parameter does
@@ -203,7 +201,7 @@ public class CorsFilter extends GenericF
* @return The parameter's value or the default value if the parameter does
* not exist
*/
- private String getInitParameter(String name, String defaultValue){
+ private String getInitParameter(String name, String defaultValue) {
String value = getInitParameter(name);
if (value != null) {
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java Wed
May 23 14:47:45 2018
@@ -169,11 +169,8 @@ public class CsrfPreventionFilter extend
return addNonce(super.encodeURL(url));
}
- /**
+ /*
* 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/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Wed
May 23 14:47:45 2018
@@ -344,7 +344,8 @@ public abstract class WebappClassLoaderB
private boolean clearReferencesStopTimerThreads = false;
/**
- * Should Tomcat call {@link org.apache.juli.logging.LogFactory#release()}
+ * 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.
Modified: tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java Wed May 23
14:47:45 2018
@@ -448,13 +448,9 @@ public class MapperListener extends Life
}
}
- /**
+ /*
* Populate <code>wrappers</code> list with information for registration of
* mappings for this wrapper in this context.
- *
- * @param context
- * @param wrapper
- * @param list
*/
private void prepareWrapperMappingInfo(Context context, Wrapper wrapper,
List<WrapperMappingInfo> wrappers) {
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java Wed May 23
14:47:45 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/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Wed May
23 14:47:45 2018
@@ -1957,7 +1957,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
@@ -2000,7 +1999,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/trunk/java/org/apache/jasper/compiler/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java Wed May 23
14:47:45 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/trunk/java/org/apache/jasper/compiler/JspReader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java Wed May 23
14:47:45 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/trunk/java/org/apache/jasper/el/JasperELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/JasperELResolver.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/JasperELResolver.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/JasperELResolver.java Wed May 23
14:47:45 2018
@@ -158,8 +158,8 @@ public class JasperELResolver extends Co
return null;
}
- /**
- * Copied from {@link org.apache.el.lang.ELSupport#coerceToString(Object)}.
+ /*
+ * Copied from
org.apache.el.lang.ELSupport#coerceToString(ELContext,Object)
*/
private static final String coerceToString(final Object obj) {
if (obj == null) {
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java Wed
May 23 14:47:45 2018
@@ -306,14 +306,14 @@ public class PoolableConnection extends
}
}
- /**
+ /*
* Checks the SQLState of the input exception and any nested SQLExceptions
it wraps.
- * <p>
- * If {@link #getDisconnectSqlCodes() disconnectSQLCodes} has been set,
sql states
+ *
+ * If _disconnectSQLCodes has been set, sql states
* are compared to those in the configured list of fatal exception codes.
If this
* property is not set, codes are compared against the default codes in
- * #{@link Utils.DISCONNECTION_SQL_CODES} and in this case anything
starting with
- * #{link Utils.DISCONNECTION_SQL_CODE_PREFIX} is considered a
disconnection.</p>
+ * Utils.DISCONNECTION_SQL_CODES and in this case anything starting with
+ * Utils.DISCONNECTION_SQL_CODE_PREFIX is considered a disconnection.</p>
*
* @param e SQLException to be examined
* @return true if the exception signals a disconnection
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
Wed May 23 14:47:45 2018
@@ -360,14 +360,14 @@ class PooledConnectionImpl
}
/**
- * Create a {@link PooledConnectionImpl.PStmtKey} for the given arguments.
+ * Create a {@link PStmtKeyCPDS} for the given arguments.
*/
protected PStmtKeyCPDS createKey(final String sql, final int
autoGeneratedKeys) {
return new PStmtKeyCPDS(normalizeSQL(sql), autoGeneratedKeys);
}
/**
- * Create a {@link PooledConnectionImpl.PStmtKey} for the given arguments.
+ * Create a {@link PStmtKeyCPDS} for the given arguments.
*/
protected PStmtKeyCPDS createKey(final String sql, final int resultSetType,
final int resultSetConcurrency, final int resultSetHoldability) {
@@ -376,21 +376,21 @@ class PooledConnectionImpl
}
/**
- * Create a {@link PooledConnectionImpl.PStmtKey} for the given arguments.
+ * Create a {@link PStmtKeyCPDS} for the given arguments.
*/
protected PStmtKeyCPDS createKey(final String sql, final int
columnIndexes[]) {
return new PStmtKeyCPDS(normalizeSQL(sql), columnIndexes);
}
/**
- * Create a {@link PooledConnectionImpl.PStmtKey} for the given arguments.
+ * Create a {@link PStmtKeyCPDS} for the given arguments.
*/
protected PStmtKeyCPDS createKey(final String sql, final String
columnNames[]) {
return new PStmtKeyCPDS(normalizeSQL(sql), columnNames);
}
/**
- * Create a {@link PooledConnectionImpl.PStmtKey} for the given arguments.
+ * Create a {@link PStmtKeyCPDS} for the given arguments.
*/
protected PStmtKeyCPDS createKey(final String sql, final int resultSetType,
final int resultSetConcurrency) {
@@ -399,7 +399,7 @@ class PooledConnectionImpl
}
/**
- * Create a {@link PooledConnectionImpl.PStmtKey} for the given arguments.
+ * Create a {@link PStmtKeyCPDS} for the given arguments.
*/
protected PStmtKeyCPDS createKey(final String sql) {
return new PStmtKeyCPDS(normalizeSQL(sql));
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java Wed May 23
14:47:45 2018
@@ -1594,7 +1594,7 @@ public final class PoolUtils {
* @param erodingFactor
* erosion factor - determines the frequency of erosion
* events
- * @see #factor
+ * @see #erodingFactor
*/
protected ErodingKeyedObjectPool(final KeyedObjectPool<K, V> keyedPool,
final ErodingFactor erodingFactor) {
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java
Wed May 23 14:47:45 2018
@@ -232,9 +232,10 @@ public class AbandonedConfig {
}
/**
- * If the pool implements {@link UsageTracking}, should the pool record a
- * stack trace every time a method is called on a pooled object and retain
- * the most recent stack trace to aid debugging of abandoned objects?
+ * If the pool implements
+ * {@link org.apache.tomcat.dbcp.pool2.UsageTracking}, should the pool
+ * record a stack trace every time a method is called on a pooled object
and
+ * retain the most recent stack trace to aid debugging of abandoned
objects?
*/
private boolean useUsageTracking = false;
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java Wed
May 23 14:47:45 2018
@@ -66,9 +66,9 @@ class EvictionTimer {
/**
* Add the specified eviction task to the timer. Tasks that are added with
a
- * call to this method *must* call {@link #cancel(TimerTask)} to cancel the
- * task to prevent memory and/or thread leaks in application server
- * environments.
+ * call to this method *must* call {@link #cancel(TimerTask,long,TimeUnit)}
+ * to cancel the task to prevent memory and/or thread leaks in application
+ * server environments.
* @param task Task to be scheduled
* @param delay Delay in milliseconds before task is executed
* @param period Time in milliseconds between executions
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
Wed May 23 14:47:45 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/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java Wed
May 23 14:47:45 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/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java Wed
May 23 14:47:45 2018
@@ -62,9 +62,7 @@ public class IOUtils {
/**
* The default buffer size ({@value}) to use for
- * {@link #copyLarge(InputStream, OutputStream)}
- * and
- * {@link #copyLarge(Reader, Writer)}
+ * {@link #copyLarge(InputStream, OutputStream)}.
*/
private static final int DEFAULT_BUFFER_SIZE = 1024 * 4;
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/Cookie.java Wed May 23
14:47:45 2018
@@ -622,7 +622,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/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Wed
May 23 14:47:45 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/trunk/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TesterServletEncodeUrl.java?rev=1832108&r1=1832107&r2=1832108&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
Wed May 23 14:47:45 2018
@@ -32,13 +32,6 @@ public class TesterServletEncodeUrl exte
private static final long serialVersionUID = 1L;
- /**
- * 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.
- */
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
