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 f2f5e3ebea Expand CheckStyle validation of Javadoc
f2f5e3ebea is described below
commit f2f5e3ebeaa5bd216a7f25211296148c92e3ec34
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jan 12 14:48:54 2023 +0000
Expand CheckStyle validation of Javadoc
---
java/javax/el/ExpressionFactory.java | 1 -
java/javax/servlet/Servlet.java | 1 -
java/javax/servlet/ServletContext.java | 3 +-
java/javax/servlet/http/HttpUtils.java | 3 --
java/javax/servlet/jsp/HttpJspPage.java | 3 +-
java/org/apache/catalina/ant/jmx/Arg.java | 5 ---
.../ant/jmx/JMXAccessorEqualsCondition.java | 1 -
java/org/apache/catalina/connector/Connector.java | 1 -
.../catalina/core/ApplicationContextFacade.java | 2 +-
java/org/apache/catalina/core/StandardContext.java | 4 +-
.../apache/catalina/ha/session/DeltaManager.java | 1 -
.../apache/catalina/ha/session/DeltaSession.java | 1 -
.../apache/catalina/ha/session/SessionMessage.java | 10 ++---
.../catalina/manager/HTMLManagerServlet.java | 1 -
.../org/apache/catalina/realm/DataSourceRealm.java | 1 -
java/org/apache/catalina/realm/JDBCRealm.java | 1 -
java/org/apache/catalina/realm/RealmBase.java | 10 +++--
.../apache/catalina/tribes/ChannelException.java | 7 +---
.../apache/catalina/tribes/ChannelListener.java | 2 -
.../org/apache/catalina/tribes/ChannelMessage.java | 2 +-
java/org/apache/catalina/tribes/Member.java | 1 -
.../catalina/tribes/group/ChannelCoordinator.java | 1 -
.../tribes/group/ChannelInterceptorBase.java | 1 -
.../apache/catalina/tribes/group/GroupChannel.java | 2 -
.../interceptors/FragmentationInterceptor.java | 1 -
.../group/interceptors/NonBlockingCoordinator.java | 1 -
.../group/interceptors/OrderInterceptor.java | 2 -
.../interceptors/StaticMembershipInterceptor.java | 1 -
.../group/interceptors/TcpPingInterceptor.java | 1 -
java/org/apache/catalina/tribes/io/BufferPool.java | 5 ---
.../catalina/tribes/io/BufferPool15Impl.java | 4 --
.../catalina/tribes/tipis/ReplicatedMapEntry.java | 1 -
.../catalina/tribes/transport/ReceiverBase.java | 1 -
.../catalina/tribes/transport/SenderState.java | 4 --
java/org/apache/catalina/util/URLEncoder.java | 1 -
java/org/apache/coyote/RequestGroupInfo.java | 6 +--
java/org/apache/coyote/RequestInfo.java | 3 +-
java/org/apache/coyote/Response.java | 7 ++--
java/org/apache/jasper/compiler/Node.java | 2 -
java/org/apache/jasper/tagplugins/jstl/Util.java | 5 ++-
.../org/apache/jasper/util/FastRemovalDequeue.java | 1 -
java/org/apache/tomcat/JarScanFilter.java | 2 -
.../tomcat/dbcp/dbcp2/DelegatingStatement.java | 2 -
.../tomcat/dbcp/dbcp2/PoolableConnection.java | 2 -
.../dbcp2/datasources/CPDSConnectionFactory.java | 1 -
java/org/apache/tomcat/jni/Address.java | 3 +-
java/org/apache/tomcat/jni/BIOCallback.java | 3 +-
java/org/apache/tomcat/jni/Directory.java | 3 +-
java/org/apache/tomcat/jni/Error.java | 3 +-
java/org/apache/tomcat/jni/File.java | 21 +++++++----
java/org/apache/tomcat/jni/FileInfo.java | 12 ++++--
java/org/apache/tomcat/jni/Global.java | 3 +-
java/org/apache/tomcat/jni/Library.java | 4 --
.../apache/tomcat/jni/LibraryNotFoundError.java | 1 -
java/org/apache/tomcat/jni/Lock.java | 3 +-
java/org/apache/tomcat/jni/Mmap.java | 3 +-
java/org/apache/tomcat/jni/Multicast.java | 3 +-
java/org/apache/tomcat/jni/OS.java | 3 +-
java/org/apache/tomcat/jni/PasswordCallback.java | 3 +-
java/org/apache/tomcat/jni/Poll.java | 3 +-
java/org/apache/tomcat/jni/PoolCallback.java | 3 +-
java/org/apache/tomcat/jni/Proc.java | 44 ++++++++++++++--------
java/org/apache/tomcat/jni/ProcErrorCallback.java | 3 +-
java/org/apache/tomcat/jni/Procattr.java | 3 +-
java/org/apache/tomcat/jni/Registry.java | 3 +-
java/org/apache/tomcat/jni/SSL.java | 4 --
java/org/apache/tomcat/jni/SSLConf.java | 2 -
java/org/apache/tomcat/jni/SSLContext.java | 4 --
java/org/apache/tomcat/jni/SSLSocket.java | 3 +-
java/org/apache/tomcat/jni/Shm.java | 3 +-
java/org/apache/tomcat/jni/Sockaddr.java | 8 ++--
java/org/apache/tomcat/jni/Socket.java | 18 ++++-----
java/org/apache/tomcat/jni/Status.java | 6 ++-
java/org/apache/tomcat/jni/Stdlib.java | 3 +-
java/org/apache/tomcat/jni/Thread.java | 3 +-
java/org/apache/tomcat/jni/Time.java | 3 +-
java/org/apache/tomcat/jni/User.java | 3 +-
java/org/apache/tomcat/util/buf/MessageBytes.java | 18 ++++++---
.../tomcat/util/digester/DocumentProperties.java | 1 -
java/org/apache/tomcat/util/http/MimeHeaders.java | 19 +++++-----
java/org/apache/tomcat/util/http/Parameters.java | 7 +---
.../util/http/fileupload/FileItemIterator.java | 12 ++++--
.../apache/tomcat/util/modeler/BaseModelMBean.java | 3 +-
.../apache/tomcat/util/modeler/ManagedBean.java | 4 +-
java/org/apache/tomcat/util/net/SSLSupport.java | 2 -
.../apache/tomcat/util/net/jsse/JSSESupport.java | 21 +++++------
.../server/WsRemoteEndpointImplServer.java | 1 -
.../apache/tomcat/jdbc/pool/DataSourceProxy.java | 1 -
.../apache/tomcat/jdbc/pool/FairBlockingQueue.java | 1 -
.../apache/tomcat/jdbc/pool/PooledConnection.java | 1 -
.../jdbc/pool/interceptor/SlowQueryReport.java | 7 ++--
res/checkstyle/checkstyle.xml | 1 +
.../filters/TesterHttpServletResponse.java | 1 -
.../org/apache/catalina/startup/BytesStreamer.java | 3 --
.../catalina/startup/NoMappingParamServlet.java | 4 --
test/org/apache/catalina/startup/ParamServlet.java | 4 --
.../apache/catalina/tribes/demos/EchoRpcTest.java | 1 -
97 files changed, 190 insertions(+), 227 deletions(-)
diff --git a/java/javax/el/ExpressionFactory.java
b/java/javax/el/ExpressionFactory.java
index 607d161787..815e6f9b01 100644
--- a/java/javax/el/ExpressionFactory.java
+++ b/java/javax/el/ExpressionFactory.java
@@ -37,7 +37,6 @@ import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
- *
* @since 2.1
*/
public abstract class ExpressionFactory {
diff --git a/java/javax/servlet/Servlet.java b/java/javax/servlet/Servlet.java
index 327376df25..e6bfa64c43 100644
--- a/java/javax/servlet/Servlet.java
+++ b/java/javax/servlet/Servlet.java
@@ -87,7 +87,6 @@ public interface Servlet {
public void init(ServletConfig config) throws ServletException;
/**
- *
* Returns a {@link ServletConfig} object, which contains initialization
and
* startup parameters for this servlet. The <code>ServletConfig</code>
* object returned is the one passed to the <code>init</code> method.
diff --git a/java/javax/servlet/ServletContext.java
b/java/javax/servlet/ServletContext.java
index 68a3aab8b3..594d814847 100644
--- a/java/javax/servlet/ServletContext.java
+++ b/java/javax/servlet/ServletContext.java
@@ -610,7 +610,7 @@ public interface ServletContext {
public ServletRegistration.Dynamic addServlet(String servletName, Servlet
servlet);
/**
- * Add servlet to context.
+ * Add servlet to the context.
* @param servletName Name of servlet to add
* @param servletClass Class of servlet to add
* @return <code>null</code> if the servlet has already been fully
defined,
@@ -631,6 +631,7 @@ public interface ServletContext {
Class<? extends Servlet> servletClass);
/**
+ * Add a JSP to the context.
*
* @param jspName The servlet name under which this JSP file should be
* registered
diff --git a/java/javax/servlet/http/HttpUtils.java
b/java/javax/servlet/http/HttpUtils.java
index c411da19e4..d9fd5e4f8b 100644
--- a/java/javax/servlet/http/HttpUtils.java
+++ b/java/javax/servlet/http/HttpUtils.java
@@ -49,7 +49,6 @@ public class HttpUtils {
/**
- *
* Parses a query string passed from the client to the
* server and builds a <code>HashTable</code> object
* with key-value pairs.
@@ -114,7 +113,6 @@ public class HttpUtils {
/**
- *
* Parses data from an HTML form that the client sends to
* the server using the HTTP POST method and the
* <i>application/x-www-form-urlencoded</i> MIME type.
@@ -237,7 +235,6 @@ public class HttpUtils {
/**
- *
* Reconstructs the URL the client used to make the request,
* using information in the <code>HttpServletRequest</code> object.
* The returned URL contains a protocol, server name, port
diff --git a/java/javax/servlet/jsp/HttpJspPage.java
b/java/javax/servlet/jsp/HttpJspPage.java
index c7b269764b..993b798294 100644
--- a/java/javax/servlet/jsp/HttpJspPage.java
+++ b/java/javax/servlet/jsp/HttpJspPage.java
@@ -36,7 +36,8 @@ import javax.servlet.http.HttpServletResponse;
public interface HttpJspPage extends JspPage {
- /** The _jspService()method corresponds to the body of the JSP page. This
+ /**
+ * The _jspService()method corresponds to the body of the JSP page. This
* method is defined automatically by the JSP container and should never
* be defined by the JSP page author.
* <p>
diff --git a/java/org/apache/catalina/ant/jmx/Arg.java
b/java/org/apache/catalina/ant/jmx/Arg.java
index 656aba1a7d..dc47302f3a 100644
--- a/java/org/apache/catalina/ant/jmx/Arg.java
+++ b/java/org/apache/catalina/ant/jmx/Arg.java
@@ -16,11 +16,6 @@
*/
package org.apache.catalina.ant.jmx;
-/**
- *
- * @author Peter Rossbach
- * @since 5.5.10
- */
public class Arg {
private String type;
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
index e7e0932d9f..7fcccc6743 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
@@ -19,7 +19,6 @@ package org.apache.catalina.ant.jmx;
import org.apache.tools.ant.BuildException;
/**
- *
* Definition
* <pre>
* <path id="catalina_ant">
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index 3066b33ab6..99d0411a47 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -773,7 +773,6 @@ public class Connector extends LifecycleMBeanBase {
/**
- *
* @return The Charset to use to convert raw URI bytes (after %nn decoding)
* to characters. This will never be null
*/
diff --git a/java/org/apache/catalina/core/ApplicationContextFacade.java
b/java/org/apache/catalina/core/ApplicationContextFacade.java
index d39c97b052..ae8b2ad97a 100644
--- a/java/org/apache/catalina/core/ApplicationContextFacade.java
+++ b/java/org/apache/catalina/core/ApplicationContextFacade.java
@@ -942,8 +942,8 @@ public class ApplicationContextFacade implements
ServletContext {
/**
- *
* Throw the real exception.
+ *
* @param ex The current exception
*/
private void handleException(Exception ex)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 243c18b1b0..f89f36de55 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2620,8 +2620,8 @@ public class StandardContext extends ContainerBase
}
- /** Get the absolute path to the work dir.
- * To avoid duplication.
+ /**
+ * Get the absolute path to the work dir. To avoid duplication.
*
* @return The work path
*/
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index d840b1b70c..2217d7ca70 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -370,7 +370,6 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- *
* @return the sendAllSessions.
*/
public boolean isSendAllSessions() {
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java
b/java/org/apache/catalina/ha/session/DeltaSession.java
index f2640a7f8f..e4371321e9 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -49,7 +49,6 @@ import org.apache.tomcat.util.collections.SynchronizedStack;
import org.apache.tomcat.util.res.StringManager;
/**
- *
* Similar to the StandardSession except that this session will keep
* track of deltas during a request.
*/
diff --git a/java/org/apache/catalina/ha/session/SessionMessage.java
b/java/org/apache/catalina/ha/session/SessionMessage.java
index 65173768b3..83384a4ed5 100644
--- a/java/org/apache/catalina/ha/session/SessionMessage.java
+++ b/java/org/apache/catalina/ha/session/SessionMessage.java
@@ -18,11 +18,9 @@ package org.apache.catalina.ha.session;
import org.apache.catalina.ha.ClusterMessage;
/**
- *
- * <B>Class Description:</B><BR>
- * The SessionMessage class is a class that is used when a session has been
- * created, modified, expired in a Tomcat cluster node.<BR>
- *
+ * The SessionMessage interface is used when a session has been created,
+ * modified, expired in a Tomcat cluster node.
+ * <p>
* The following events are currently available:
* <ul>
* <li><pre>public static final int EVT_SESSION_CREATED</pre><li>
@@ -35,9 +33,7 @@ import org.apache.catalina.ha.ClusterMessage;
* <li><pre>public static final int EVT_CHANGE_SESSION_ID</pre><li>
* <li><pre>public static final int
EVT_ALL_SESSION_NOCONTEXTMANAGER</pre><li>
* </ul>
- *
*/
-
public interface SessionMessage extends ClusterMessage {
/**
diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java
b/java/org/apache/catalina/manager/HTMLManagerServlet.java
index 8c20448c52..13b548a83a 100644
--- a/java/org/apache/catalina/manager/HTMLManagerServlet.java
+++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java
@@ -815,7 +815,6 @@ public final class HTMLManagerServlet extends
ManagerServlet {
// ------------------------------------------------ Sessions administration
/**
- *
* Extract the expiration request parameter
*
* @param cn Name of the application from which to expire sessions
diff --git a/java/org/apache/catalina/realm/DataSourceRealm.java
b/java/org/apache/catalina/realm/DataSourceRealm.java
index a1cdb19c6f..8ac2e37f01 100644
--- a/java/org/apache/catalina/realm/DataSourceRealm.java
+++ b/java/org/apache/catalina/realm/DataSourceRealm.java
@@ -31,7 +31,6 @@ import org.apache.catalina.LifecycleException;
import org.apache.naming.ContextBindings;
/**
- *
* Implementation of <b>Realm</b> that works with any JDBC JNDI DataSource.
* See the Realm How-To for more details on how to set up the database and
* for configuration options.
diff --git a/java/org/apache/catalina/realm/JDBCRealm.java
b/java/org/apache/catalina/realm/JDBCRealm.java
index a95727c0df..8ea0a1f3f3 100644
--- a/java/org/apache/catalina/realm/JDBCRealm.java
+++ b/java/org/apache/catalina/realm/JDBCRealm.java
@@ -31,7 +31,6 @@ import org.apache.tomcat.util.ExceptionUtils;
/**
- *
* Implementation of <b>Realm</b> that works with any JDBC supported database.
* See the JDBCRealm.howto for more details on how to set up the database and
* for configuration options.
diff --git a/java/org/apache/catalina/realm/RealmBase.java
b/java/org/apache/catalina/realm/RealmBase.java
index a2f031076a..e5da7792a8 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -1507,14 +1507,16 @@ public abstract class RealmBase extends
LifecycleMBeanBase implements Realm {
protected static class AllRolesMode {
private final String name;
- /** Use the strict servlet spec interpretation which requires that the
user
+ /**
+ * Use the strict servlet spec interpretation which requires that the
user
* have one of the web-app/security-role/role-name
*/
public static final AllRolesMode STRICT_MODE = new
AllRolesMode("strict");
- /** Allow any authenticated user
- */
+ /** Allow any authenticated user */
public static final AllRolesMode AUTH_ONLY_MODE = new
AllRolesMode("authOnly");
- /** Allow any authenticated user only if there are no
web-app/security-roles
+ /**
+ * Allow any authenticated user only if there are no
+ * web-app/security-roles
*/
public static final AllRolesMode STRICT_AUTH_ONLY_MODE = new
AllRolesMode("strictAuthOnly");
diff --git a/java/org/apache/catalina/tribes/ChannelException.java
b/java/org/apache/catalina/tribes/ChannelException.java
index 9eb12fc159..5279c35b40 100644
--- a/java/org/apache/catalina/tribes/ChannelException.java
+++ b/java/org/apache/catalina/tribes/ChannelException.java
@@ -147,11 +147,8 @@ public class ChannelException extends Exception {
}
/**
- *
- * <p>Title: FaultyMember class</p>
- *
- * <p>Description: Represent a failure to a specific member when a message
was sent
- * to more than one member</p>
+ * Represent a failure to a specific member when a message was sent to more
+ * than one member
*/
public static class FaultyMember {
protected final Exception cause;
diff --git a/java/org/apache/catalina/tribes/ChannelListener.java
b/java/org/apache/catalina/tribes/ChannelListener.java
index 6a18a4ea10..c99478006c 100644
--- a/java/org/apache/catalina/tribes/ChannelListener.java
+++ b/java/org/apache/catalina/tribes/ChannelListener.java
@@ -46,7 +46,6 @@ public interface ChannelListener {
public boolean accept(Serializable msg, Member sender);
/**
- *
* @param listener Object
* @return boolean
* @see Object#equals(Object)
@@ -55,7 +54,6 @@ public interface ChannelListener {
public boolean equals(Object listener);
/**
- *
* @return int
* @see Object#hashCode()
*/
diff --git a/java/org/apache/catalina/tribes/ChannelMessage.java
b/java/org/apache/catalina/tribes/ChannelMessage.java
index ab7200f8a1..70de5dd55f 100644
--- a/java/org/apache/catalina/tribes/ChannelMessage.java
+++ b/java/org/apache/catalina/tribes/ChannelMessage.java
@@ -52,8 +52,8 @@ public interface ChannelMessage extends Serializable,
Cloneable {
public long getTimestamp();
/**
+ * Sets the timestamp of this message.
*
- * Sets the timestamp of this message
* @param timestamp The timestamp
*/
public void setTimestamp(long timestamp);
diff --git a/java/org/apache/catalina/tribes/Member.java
b/java/org/apache/catalina/tribes/Member.java
index bf5755b0e7..f8ce61f1d1 100644
--- a/java/org/apache/catalina/tribes/Member.java
+++ b/java/org/apache/catalina/tribes/Member.java
@@ -92,7 +92,6 @@ public interface Member extends Serializable {
public boolean isSuspect();
/**
- *
* @return boolean - true if the member has been confirmed to malfunction
*/
public boolean isFailing();
diff --git a/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
b/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
index 4f5826114a..89690d8b17 100644
--- a/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
+++ b/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
@@ -352,7 +352,6 @@ public class ChannelCoordinator extends
ChannelInterceptorBase implements Messag
}
/**
- *
* @param mbr Member
* @return Member
*/
diff --git a/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
b/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
index 9e0519cab6..b883412cdf 100644
--- a/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
+++ b/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
@@ -146,7 +146,6 @@ public abstract class ChannelInterceptorBase implements
ChannelInterceptor {
}
/**
- *
* @param mbr Member
* @return Member
*/
diff --git a/java/org/apache/catalina/tribes/group/GroupChannel.java
b/java/org/apache/catalina/tribes/group/GroupChannel.java
index 4a810937c6..78ffda6a45 100644
--- a/java/org/apache/catalina/tribes/group/GroupChannel.java
+++ b/java/org/apache/catalina/tribes/group/GroupChannel.java
@@ -232,7 +232,6 @@ public class GroupChannel extends ChannelInterceptorBase
}
/**
- *
* @param destination Member[] - destination.length > 0
* @param msg Serializable - the message to send
* @param options sender options, options can trigger guarantee levels and
different
@@ -663,7 +662,6 @@ public class GroupChannel extends ChannelInterceptorBase
}
/**
- *
* Removes a channel listener from the channel.<br>
* Channel listeners are uniquely identified using the equals(Object)
method
* @param channelListener ChannelListener
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
b/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
index 2a1eeecf7a..98c8353f6f 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
+++
b/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
@@ -31,7 +31,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
/**
- *
* The fragmentation interceptor splits up large messages into smaller
messages and assembles them on the other end.
* This is very useful when you don't want large messages hogging the sending
sockets
* and smaller messages can make it through.
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
index bbe9462b0a..4ad6cce9c5 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
+++
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
@@ -628,7 +628,6 @@ public class NonBlockingCoordinator extends
ChannelInterceptorBase {
}
/**
- *
* @param mbr Member
* @return Member
*/
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
b/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
index 5607e2cae5..1fbf67b8a0 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
@@ -31,7 +31,6 @@ import org.apache.catalina.tribes.util.StringManager;
/**
- *
* The order interceptor guarantees that messages are received in the same
order they were
* sent.
* This interceptor works best with the ack=true setting. <br>
@@ -126,7 +125,6 @@ public class OrderInterceptor extends
ChannelInterceptorBase {
}
}
/**
- *
* @param order MessageOrder
* @return boolean - true if a message expired and was processed
*/
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
b/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
index 4c4477db67..be1a68f0e4 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
+++
b/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
@@ -135,7 +135,6 @@ public class StaticMembershipInterceptor extends
ChannelInterceptorBase
}
/**
- *
* @param mbr Member
* @return Member
*/
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
b/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
index f0e488bd3f..e1a9302ba0 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
@@ -32,7 +32,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
/**
- *
* Sends a ping to all members.
* Configure this interceptor with the TcpFailureDetector below it,
* and the TcpFailureDetector will act as the membership guide.
diff --git a/java/org/apache/catalina/tribes/io/BufferPool.java
b/java/org/apache/catalina/tribes/io/BufferPool.java
index 649ff2826a..cb6dce5672 100644
--- a/java/org/apache/catalina/tribes/io/BufferPool.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool.java
@@ -21,11 +21,6 @@ import org.apache.catalina.tribes.util.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-/**
- *
- *
- * @version 1.0
- */
public class BufferPool {
private static final Log log = LogFactory.getLog(BufferPool.class);
diff --git a/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
b/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
index e5fa2aa7a7..3137b2c57e 100644
--- a/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
@@ -19,10 +19,6 @@ package org.apache.catalina.tribes.io;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger;
-/**
- *
- * @version 1.0
- */
class BufferPool15Impl implements BufferPool.BufferPoolAPI {
protected int maxSize;
protected final AtomicInteger size = new AtomicInteger(0);
diff --git a/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java
b/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java
index afa1e26aad..8bc5b5fbdf 100644
--- a/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java
+++ b/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.io.Serializable;
/**
- *
* For smarter replication, an object can implement this interface to
replicate diffs<br>
* The replication logic will call the methods in the following order:<br>
* <code>
diff --git a/java/org/apache/catalina/tribes/transport/ReceiverBase.java
b/java/org/apache/catalina/tribes/transport/ReceiverBase.java
index ee4efd56ba..31d84d48b3 100644
--- a/java/org/apache/catalina/tribes/transport/ReceiverBase.java
+++ b/java/org/apache/catalina/tribes/transport/ReceiverBase.java
@@ -140,7 +140,6 @@ public abstract class ReceiverBase implements
ChannelReceiver, ListenCallback, R
}
/**
- *
* @return The port
*/
@Override
diff --git a/java/org/apache/catalina/tribes/transport/SenderState.java
b/java/org/apache/catalina/tribes/transport/SenderState.java
index 6fed5934e2..fedac53917 100644
--- a/java/org/apache/catalina/tribes/transport/SenderState.java
+++ b/java/org/apache/catalina/tribes/transport/SenderState.java
@@ -65,10 +65,6 @@ public class SenderState {
this.state = state;
}
- /**
- *
- * @return boolean
- */
public boolean isSuspect() {
return (state == SUSPECT) || (state == FAILING);
}
diff --git a/java/org/apache/catalina/util/URLEncoder.java
b/java/org/apache/catalina/util/URLEncoder.java
index d686377167..2ac1d66a66 100644
--- a/java/org/apache/catalina/util/URLEncoder.java
+++ b/java/org/apache/catalina/util/URLEncoder.java
@@ -23,7 +23,6 @@ import java.nio.charset.Charset;
import java.util.BitSet;
/**
- *
* This class is very similar to the java.net.URLEncoder class.
*
* Unfortunately, with java.net.URLEncoder there is no way to specify to the
diff --git a/java/org/apache/coyote/RequestGroupInfo.java
b/java/org/apache/coyote/RequestGroupInfo.java
index e2ca05bd35..7c6abb4eb8 100644
--- a/java/org/apache/coyote/RequestGroupInfo.java
+++ b/java/org/apache/coyote/RequestGroupInfo.java
@@ -21,9 +21,9 @@ import java.util.List;
import org.apache.tomcat.util.modeler.BaseModelMBean;
-/** This can be moved to top level ( eventually with a better name ).
- * It is currently used only as a JMX artifact, to aggregate the data
- * collected from each RequestProcessor thread.
+/**
+ * Only as a JMX artifact, to aggregate the data collected from each
+ * RequestProcessor thread.
*/
public class RequestGroupInfo extends BaseModelMBean {
private final List<RequestInfo> processors = new ArrayList<>();
diff --git a/java/org/apache/coyote/RequestInfo.java
b/java/org/apache/coyote/RequestInfo.java
index 0e2c74a342..9a6b7778b1 100644
--- a/java/org/apache/coyote/RequestInfo.java
+++ b/java/org/apache/coyote/RequestInfo.java
@@ -157,7 +157,8 @@ public class RequestInfo {
private long lastRequestProcessingTime = 0;
- /** Called by the processor before recycling the request. It'll collect
+ /**
+ * Called by the processor before recycling the request. It'll collect
* statistic information.
*/
void updateCounters() {
diff --git a/java/org/apache/coyote/Response.java
b/java/org/apache/coyote/Response.java
index 36092008a4..c96159275b 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -432,9 +432,10 @@ public final class Response {
}
- /** Signal that we're done with the headers, and body will follow.
- * Any implementation needs to notify ContextManager, to allow
- * interceptors to fix headers.
+ /**
+ * Signal that we're done with the headers, and body will follow. Any
+ * implementation needs to notify ContextManager, to allow interceptors to
+ * fix headers.
*/
public void sendHeaders() {
action(ActionCode.COMMIT, this);
diff --git a/java/org/apache/jasper/compiler/Node.java
b/java/org/apache/jasper/compiler/Node.java
index 13a2e511a7..510fe9edb1 100644
--- a/java/org/apache/jasper/compiler/Node.java
+++ b/java/org/apache/jasper/compiler/Node.java
@@ -2199,7 +2199,6 @@ abstract class Node implements TagConstants {
}
/**
- *
* @return return true if there's TagAttributeInfo meaning we need to
* assign a ValueExpression
*/
@@ -2208,7 +2207,6 @@ abstract class Node implements TagConstants {
}
/**
- *
* @return return true if there's TagAttributeInfo meaning we need to
* assign a MethodExpression
*/
diff --git a/java/org/apache/jasper/tagplugins/jstl/Util.java
b/java/org/apache/jasper/tagplugins/jstl/Util.java
index efe250860a..33a7473a6f 100644
--- a/java/org/apache/jasper/tagplugins/jstl/Util.java
+++ b/java/org/apache/jasper/tagplugins/jstl/Util.java
@@ -285,8 +285,9 @@ public class Util {
}
}
- /** Wraps responses to allow us to retrieve results as Strings.
- * mainly taken from
org.apache.taglibs.standard.tag.common.core.importSupport
+ /**
+ * Wraps responses to allow us to retrieve results as Strings. Mainly taken
+ * from org.apache.taglibs.standard.tag.common.core.importSupport.
*/
public static class ImportResponseWrapper extends
HttpServletResponseWrapper{
diff --git a/java/org/apache/jasper/util/FastRemovalDequeue.java
b/java/org/apache/jasper/util/FastRemovalDequeue.java
index 88d5bcd32c..e2c3ef497a 100644
--- a/java/org/apache/jasper/util/FastRemovalDequeue.java
+++ b/java/org/apache/jasper/util/FastRemovalDequeue.java
@@ -17,7 +17,6 @@
package org.apache.jasper.util;
/**
- *
* The FastRemovalDequeue is a Dequeue that supports constant time removal of
* entries. This is achieved by using a doubly linked list and wrapping any
object
* added to the collection with an Entry type, that is returned to the
consumer.
diff --git a/java/org/apache/tomcat/JarScanFilter.java
b/java/org/apache/tomcat/JarScanFilter.java
index d3aeb45beb..f616fe46fc 100644
--- a/java/org/apache/tomcat/JarScanFilter.java
+++ b/java/org/apache/tomcat/JarScanFilter.java
@@ -19,7 +19,6 @@ package org.apache.tomcat;
public interface JarScanFilter {
/**
- *
* @param jarScanType The type of JAR scan currently being performed
* @param jarName The name of the JAR file (without any path
* information) to be checked to see if it should
@@ -30,7 +29,6 @@ public interface JarScanFilter {
boolean check(JarScanType jarScanType, String jarName);
/**
- *
* @return <code>true</code> if all of the scans should be skipped which
* can improve startup performance. The default is <code>false</code>.
*/
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
index e75d5ff5b7..696735fc46 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
@@ -61,7 +61,6 @@ public class DelegatingStatement extends AbandonedTrace
implements Statement {
}
/**
- *
* @throws SQLException
* thrown by the delegating statement.
* @since 2.4.0 made public, was protected in 2.3.0.
@@ -665,7 +664,6 @@ public class DelegatingStatement extends AbandonedTrace
implements Statement {
}
/**
- *
* @throws SQLException
* thrown by the delegating statement.
* @since 2.4.0 made public, was protected in 2.3.0.
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
b/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
index ee277db250..3ad15ada77 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
@@ -77,7 +77,6 @@ public class PoolableConnection extends
DelegatingConnection<Connection> impleme
private final boolean fastFailValidation;
/**
- *
* @param conn
* my underlying connection
* @param pool
@@ -91,7 +90,6 @@ public class PoolableConnection extends
DelegatingConnection<Connection> impleme
}
/**
- *
* @param conn
* my underlying connection
* @param pool
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
index ec67369a94..eb90bc0a15 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
@@ -392,7 +392,6 @@ final class CPDSConnectionFactory
}
/**
- *
* @param pool
* the {@link ObjectPool} in which to pool those {@link
Connection}s
*/
diff --git a/java/org/apache/tomcat/jni/Address.java
b/java/org/apache/tomcat/jni/Address.java
index acac8008aa..a245f21f4d 100644
--- a/java/org/apache/tomcat/jni/Address.java
+++ b/java/org/apache/tomcat/jni/Address.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Address
+/**
+ * Address
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/BIOCallback.java
b/java/org/apache/tomcat/jni/BIOCallback.java
index ea9ccff67c..24736da844 100644
--- a/java/org/apache/tomcat/jni/BIOCallback.java
+++ b/java/org/apache/tomcat/jni/BIOCallback.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Open SSL BIO Callback Interface
+/**
+ * Open SSL BIO Callback Interface
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Directory.java
b/java/org/apache/tomcat/jni/Directory.java
index 473b87b71a..353483ae06 100644
--- a/java/org/apache/tomcat/jni/Directory.java
+++ b/java/org/apache/tomcat/jni/Directory.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Directory
+/**
+ * Directory
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Error.java
b/java/org/apache/tomcat/jni/Error.java
index a72cc15d56..dc312d5d82 100644
--- a/java/org/apache/tomcat/jni/Error.java
+++ b/java/org/apache/tomcat/jni/Error.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Error
+/**
+ * Error
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/File.java
b/java/org/apache/tomcat/jni/File.java
index 938e998153..4ba2e16de6 100644
--- a/java/org/apache/tomcat/jni/File.java
+++ b/java/org/apache/tomcat/jni/File.java
@@ -18,7 +18,8 @@ package org.apache.tomcat.jni;
/* Import needed classes */
import java.nio.ByteBuffer;
-/** File
+/**
+ * File
*
* @author Mladen Turk
*
@@ -48,21 +49,25 @@ public class File {
public static final int APR_FOPEN_BUFFERED = 0x00080;
/** Delete the file after close */
public static final int APR_FOPEN_DELONCLOSE = 0x00100;
- /** Platform dependent tag to open the file for
+ /**
+ * Platform dependent tag to open the file for
* use across multiple threads
*/
public static final int APR_FOPEN_XTHREAD = 0x00200;
- /** Platform dependent support for higher level locked read/write
+ /**
+ * Platform dependent support for higher level locked read/write
* access to support writes across process/machines
*/
public static final int APR_FOPEN_SHARELOCK = 0x00400;
/** Do not register a cleanup when the file is opened */
public static final int APR_FOPEN_NOCLEANUP = 0x00800;
- /** Advisory flag that this file should support
+ /**
+ * Advisory flag that this file should support
* apr_socket_sendfile operation
*/
public static final int APR_FOPEN_SENDFILE_ENABLED = 0x01000;
- /** Platform dependent flag to enable large file support;
+ /**
+ * Platform dependent flag to enable large file support;
* <br><b>Warning :</b> The APR_LARGEFILE flag only has effect on some
platforms
* where sizeof(apr_off_t) == 4. Where implemented, it allows opening
* and writing to a file which exceeds the size which can be
@@ -95,13 +100,15 @@ public class File {
/* File lock types/flags */
- /** Shared lock. More than one process or thread can hold a shared lock
+ /**
+ * Shared lock. More than one process or thread can hold a shared lock
* at any given time. Essentially, this is a "read lock", preventing
* writers from establishing an exclusive lock.
*/
public static final int APR_FLOCK_SHARED = 1;
- /** Exclusive lock. Only one process may hold an exclusive lock at any
+ /**
+ * Exclusive lock. Only one process may hold an exclusive lock at any
* given time. This is analogous to a "write lock".
*/
public static final int APR_FLOCK_EXCLUSIVE = 2;
diff --git a/java/org/apache/tomcat/jni/FileInfo.java
b/java/org/apache/tomcat/jni/FileInfo.java
index 34b67ff01c..ea18f7e021 100644
--- a/java/org/apache/tomcat/jni/FileInfo.java
+++ b/java/org/apache/tomcat/jni/FileInfo.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Fileinfo
+/**
+ * Fileinfo
*
* @author Mladen Turk
*
@@ -30,12 +31,15 @@ public class FileInfo {
/** Allocates memory and closes lingering handles in the specified pool */
public long pool;
- /** The bitmask describing valid fields of this apr_finfo_t structure
- * including all available 'wanted' fields and potentially more */
+ /**
+ * The bitmask describing valid fields of this apr_finfo_t structure
+ * including all available 'wanted' fields and potentially more.
+ */
public int valid;
/** The access permissions of the file. Mimics Unix access rights. */
public int protection;
- /** The type of file. One of APR_REG, APR_DIR, APR_CHR, APR_BLK, APR_PIPE,
+ /**
+ * The type of file. One of APR_REG, APR_DIR, APR_CHR, APR_BLK, APR_PIPE,
* APR_LNK or APR_SOCK. If the type is undetermined, the value is
APR_NOFILE.
* If the type cannot be determined, the value is APR_UNKFILE.
*/
diff --git a/java/org/apache/tomcat/jni/Global.java
b/java/org/apache/tomcat/jni/Global.java
index 7da6740f88..3f9e4bd832 100644
--- a/java/org/apache/tomcat/jni/Global.java
+++ b/java/org/apache/tomcat/jni/Global.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Global
+/**
+ * Global
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Library.java
b/java/org/apache/tomcat/jni/Library.java
index b7febeb43d..cbff50e605 100644
--- a/java/org/apache/tomcat/jni/Library.java
+++ b/java/org/apache/tomcat/jni/Library.java
@@ -18,10 +18,6 @@ package org.apache.tomcat.jni;
import java.io.File;
-/** Library
- *
- * @author Mladen Turk
- */
public final class Library {
/* Default library names */
diff --git a/java/org/apache/tomcat/jni/LibraryNotFoundError.java
b/java/org/apache/tomcat/jni/LibraryNotFoundError.java
index ab8a030e85..ede1ee1083 100644
--- a/java/org/apache/tomcat/jni/LibraryNotFoundError.java
+++ b/java/org/apache/tomcat/jni/LibraryNotFoundError.java
@@ -23,7 +23,6 @@ public class LibraryNotFoundError extends
UnsatisfiedLinkError {
private final String libraryNames;
/**
- *
* @param libraryNames A list of the file names of the native libraries
that
* failed to load
* @param errors A list of the error messages received when trying to load
diff --git a/java/org/apache/tomcat/jni/Lock.java
b/java/org/apache/tomcat/jni/Lock.java
index 64e3ed70bd..f8bb480844 100644
--- a/java/org/apache/tomcat/jni/Lock.java
+++ b/java/org/apache/tomcat/jni/Lock.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Lock
+/**
+ * Lock
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Mmap.java
b/java/org/apache/tomcat/jni/Mmap.java
index 16a88a151d..0467c09807 100644
--- a/java/org/apache/tomcat/jni/Mmap.java
+++ b/java/org/apache/tomcat/jni/Mmap.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Mmap
+/**
+ * Mmap
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Multicast.java
b/java/org/apache/tomcat/jni/Multicast.java
index fd090fdc2e..210b59dd38 100644
--- a/java/org/apache/tomcat/jni/Multicast.java
+++ b/java/org/apache/tomcat/jni/Multicast.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Multicast
+/**
+ * Multicast
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/OS.java
b/java/org/apache/tomcat/jni/OS.java
index 48f7192c9b..0105efcfa5 100644
--- a/java/org/apache/tomcat/jni/OS.java
+++ b/java/org/apache/tomcat/jni/OS.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** OS
+/**
+ * OS
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/PasswordCallback.java
b/java/org/apache/tomcat/jni/PasswordCallback.java
index 5c579ddd5e..77e08073f6 100644
--- a/java/org/apache/tomcat/jni/PasswordCallback.java
+++ b/java/org/apache/tomcat/jni/PasswordCallback.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** PasswordCallback Interface
+/**
+ * PasswordCallback Interface
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Poll.java
b/java/org/apache/tomcat/jni/Poll.java
index dd76ba5fb5..2afecf9a60 100644
--- a/java/org/apache/tomcat/jni/Poll.java
+++ b/java/org/apache/tomcat/jni/Poll.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Poll
+/**
+ * Poll
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/PoolCallback.java
b/java/org/apache/tomcat/jni/PoolCallback.java
index c709979fce..1e75c92008 100644
--- a/java/org/apache/tomcat/jni/PoolCallback.java
+++ b/java/org/apache/tomcat/jni/PoolCallback.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** PoolCallback Interface
+/**
+ * PoolCallback Interface
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Proc.java
b/java/org/apache/tomcat/jni/Proc.java
index 4ea678b6ac..c09d71fe0a 100644
--- a/java/org/apache/tomcat/jni/Proc.java
+++ b/java/org/apache/tomcat/jni/Proc.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Proc
+/**
+ * Proc
*
* @author Mladen Turk
*
@@ -31,26 +32,34 @@ public class Proc {
/*
* apr_cmdtype_e enum
*/
- public static final int APR_SHELLCM = 0; /** use the shell to invoke
the program */
- public static final int APR_PROGRAM = 1; /** invoke the program
directly, no copied env */
- public static final int APR_PROGRAM_ENV = 2; /** invoke the program,
replicating our environment */
- public static final int APR_PROGRAM_PATH = 3; /** find program on PATH,
use our environment */
- public static final int APR_SHELLCMD_ENV = 4; /** use the shell to invoke
the program,
- * replicating our
environment
- */
+ /** use the shell to invoke the program */
+ public static final int APR_SHELLCM = 0;
+ /** invoke the program directly, no copied env */
+ public static final int APR_PROGRAM = 1;
+ /** invoke the program, replicating our environment */
+ public static final int APR_PROGRAM_ENV = 2;
+ /** find program on PATH, use our environment */
+ public static final int APR_PROGRAM_PATH = 3;
+ /** use the shell to invoke the program, replicating our environment */
+ public static final int APR_SHELLCMD_ENV = 4;
/*
* apr_wait_how_e enum
*/
- public static final int APR_WAIT = 0; /** wait for the specified process
to finish */
- public static final int APR_NOWAIT = 1; /** do not wait -- just see if it
has finished */
+ /** wait for the specified process to finish */
+ public static final int APR_WAIT = 0;
+ /** do not wait -- just see if it has finished */
+ public static final int APR_NOWAIT = 1;
/*
* apr_exit_why_e enum
*/
- public static final int APR_PROC_EXIT = 1; /** process exited
normally */
- public static final int APR_PROC_SIGNAL = 2; /** process exited due
to a signal */
- public static final int APR_PROC_SIGNAL_CORE = 4; /** process exited and
dumped a core file */
+ /** process exited normally */
+ public static final int APR_PROC_EXIT = 1;
+ /** process exited due to a signal */
+ public static final int APR_PROC_SIGNAL = 2;
+ /** process exited and dumped a core file */
+ public static final int APR_PROC_SIGNAL_CORE = 4;
public static final int APR_NO_PIPE = 0;
public static final int APR_FULL_BLOCK = 1;
@@ -68,17 +77,20 @@ public class Proc {
public static final int APR_OC_REASON_DEATH = 0;
/** write_fd is unwritable */
public static final int APR_OC_REASON_UNWRITABLE = 1;
- /** a restart is occurring, perform any necessary cleanup (including
+ /**
+ * a restart is occurring, perform any necessary cleanup (including
* sending a special signal to child)
*/
public static final int APR_OC_REASON_RESTART = 2;
- /** unregister has been called, do whatever is necessary (including
+ /**
+ * unregister has been called, do whatever is necessary (including
* kill the child)
*/
public static final int APR_OC_REASON_UNREGISTER = 3;
/** somehow the child exited without us knowing ... buggy os? */
public static final int APR_OC_REASON_LOST = 4;
- /** a health check is occurring, for most maintenance functions
+ /**
+ * a health check is occurring, for most maintenance functions
* this is a no-op.
*/
public static final int APR_OC_REASON_RUNNING = 5;
diff --git a/java/org/apache/tomcat/jni/ProcErrorCallback.java
b/java/org/apache/tomcat/jni/ProcErrorCallback.java
index a9421bc034..692e7c7c25 100644
--- a/java/org/apache/tomcat/jni/ProcErrorCallback.java
+++ b/java/org/apache/tomcat/jni/ProcErrorCallback.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** ProcErrorCallback Interface
+/**
+ * ProcErrorCallback Interface
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Procattr.java
b/java/org/apache/tomcat/jni/Procattr.java
index 40800d1184..26512147e8 100644
--- a/java/org/apache/tomcat/jni/Procattr.java
+++ b/java/org/apache/tomcat/jni/Procattr.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Procattr
+/**
+ * Procattr
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Registry.java
b/java/org/apache/tomcat/jni/Registry.java
index 7a535f9747..bf32f796c6 100644
--- a/java/org/apache/tomcat/jni/Registry.java
+++ b/java/org/apache/tomcat/jni/Registry.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Windows Registry support
+/**
+ * Windows Registry support
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/SSL.java
b/java/org/apache/tomcat/jni/SSL.java
index 652921bf6f..bed1d1fa5e 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -16,10 +16,6 @@
*/
package org.apache.tomcat.jni;
-/** SSL
- *
- * @author Mladen Turk
- */
public final class SSL {
/*
diff --git a/java/org/apache/tomcat/jni/SSLConf.java
b/java/org/apache/tomcat/jni/SSLConf.java
index db855fc053..2e429a5cdc 100644
--- a/java/org/apache/tomcat/jni/SSLConf.java
+++ b/java/org/apache/tomcat/jni/SSLConf.java
@@ -16,8 +16,6 @@
*/
package org.apache.tomcat.jni;
-/** SSL Conf
- */
public final class SSLConf {
/**
diff --git a/java/org/apache/tomcat/jni/SSLContext.java
b/java/org/apache/tomcat/jni/SSLContext.java
index 49cdbd1cd9..cba81b74d3 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -20,10 +20,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-/** SSL Context
- *
- * @author Mladen Turk
- */
public final class SSLContext {
public static final byte[] DEFAULT_SESSION_ID_CONTEXT =
diff --git a/java/org/apache/tomcat/jni/SSLSocket.java
b/java/org/apache/tomcat/jni/SSLSocket.java
index 2e1b316ed0..12c79f08c5 100644
--- a/java/org/apache/tomcat/jni/SSLSocket.java
+++ b/java/org/apache/tomcat/jni/SSLSocket.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** SSL Socket
+/**
+ * SSL Socket
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Shm.java
b/java/org/apache/tomcat/jni/Shm.java
index f62d4aa39c..d5a7b34361 100644
--- a/java/org/apache/tomcat/jni/Shm.java
+++ b/java/org/apache/tomcat/jni/Shm.java
@@ -18,7 +18,8 @@ package org.apache.tomcat.jni;
import java.nio.ByteBuffer;
-/** Shm
+/**
+ * Shm
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Sockaddr.java
b/java/org/apache/tomcat/jni/Sockaddr.java
index 9d138ec36e..eada7424f2 100644
--- a/java/org/apache/tomcat/jni/Sockaddr.java
+++ b/java/org/apache/tomcat/jni/Sockaddr.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Sockaddr
+/**
+ * Sockaddr
*
* @author Mladen Turk
*
@@ -38,8 +39,9 @@ public class Sockaddr {
public int port;
/** The family */
public int family;
- /** If multiple addresses were found by apr_sockaddr_info_get(), this
- * points to a representation of the next address. */
+ /**
+ * If multiple addresses were found by apr_sockaddr_info_get(), this
+ * points to a representation of the next address. */
public long next;
}
diff --git a/java/org/apache/tomcat/jni/Socket.java
b/java/org/apache/tomcat/jni/Socket.java
index 716b83123c..242ded1f0d 100644
--- a/java/org/apache/tomcat/jni/Socket.java
+++ b/java/org/apache/tomcat/jni/Socket.java
@@ -19,7 +19,8 @@ package org.apache.tomcat.jni;
/* Import needed classes */
import java.nio.ByteBuffer;
-/** Socket
+/**
+ * Socket
*
* @author Mladen Turk
*
@@ -57,12 +58,14 @@ public class Socket {
public static final int APR_TCP_NODELAY = 512;
/** No push */
public static final int APR_TCP_NOPUSH = 1024;
- /** This flag is ONLY set internally when we set APR_TCP_NOPUSH with
+ /**
+ * This flag is ONLY set internally when we set APR_TCP_NOPUSH with
* APR_TCP_NODELAY set to tell us that APR_TCP_NODELAY should be turned on
* again when NOPUSH is turned off
*/
public static final int APR_RESET_NODELAY = 2048;
- /** Set on non-blocking sockets (timeout != 0) on which the
+ /**
+ * Set on non-blocking sockets (timeout != 0) on which the
* previous read() did not fill a buffer completely. the next
* apr_socket_recv() will first call select()/poll() rather than
* going straight into read(). (Can also be set by an application to
@@ -70,14 +73,11 @@ public class Socket {
* the app expects that an immediate read would fail.)
*/
public static final int APR_INCOMPLETE_READ = 4096;
- /** like APR_INCOMPLETE_READ, but for write
- */
+ /** like APR_INCOMPLETE_READ, but for write */
public static final int APR_INCOMPLETE_WRITE = 8192;
- /** Don't accept IPv4 connections on an IPv6 listening socket.
- */
+ /** Don't accept IPv4 connections on an IPv6 listening socket. */
public static final int APR_IPV6_V6ONLY = 16384;
- /** Delay accepting of new connections until data is available.
- */
+ /** Delay accepting of new connections until data is available. */
public static final int APR_TCP_DEFER_ACCEPT = 32768;
/* Define what type of socket shutdown should occur.
diff --git a/java/org/apache/tomcat/jni/Status.java
b/java/org/apache/tomcat/jni/Status.java
index 004340cdae..f1b0c6224d 100644
--- a/java/org/apache/tomcat/jni/Status.java
+++ b/java/org/apache/tomcat/jni/Status.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Status
+/**
+ * Status
*
* @author Mladen Turk
*
@@ -129,7 +130,8 @@ public class Status {
public static final int APR_EPROC_UNKNOWN = (APR_OS_START_ERROR + 27);
public static final int APR_ENOTENOUGHENTROPY = (APR_OS_START_ERROR + 28);
- /** APR Status Values
+ /**
+ * APR Status Values
* <PRE>
* <b>APR STATUS VALUES</b>
* APR_INCHILD Program is currently executing in the child
diff --git a/java/org/apache/tomcat/jni/Stdlib.java
b/java/org/apache/tomcat/jni/Stdlib.java
index 18e8fb2173..be49b97d80 100644
--- a/java/org/apache/tomcat/jni/Stdlib.java
+++ b/java/org/apache/tomcat/jni/Stdlib.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Stdlib
+/**
+ * Stdlib
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Thread.java
b/java/org/apache/tomcat/jni/Thread.java
index 277cfb61a0..4b2644a5a8 100644
--- a/java/org/apache/tomcat/jni/Thread.java
+++ b/java/org/apache/tomcat/jni/Thread.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Thread
+/**
+ * Thread
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/Time.java
b/java/org/apache/tomcat/jni/Time.java
index 24b054020a..241f8e2f1b 100644
--- a/java/org/apache/tomcat/jni/Time.java
+++ b/java/org/apache/tomcat/jni/Time.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** Time
+/**
+ * Time
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/jni/User.java
b/java/org/apache/tomcat/jni/User.java
index b9a0547e89..1f1295e174 100644
--- a/java/org/apache/tomcat/jni/User.java
+++ b/java/org/apache/tomcat/jni/User.java
@@ -16,7 +16,8 @@
*/
package org.apache.tomcat.jni;
-/** User
+/**
+ * User
*
* @author Mladen Turk
*
diff --git a/java/org/apache/tomcat/util/buf/MessageBytes.java
b/java/org/apache/tomcat/util/buf/MessageBytes.java
index 50ae3596dc..3442637546 100644
--- a/java/org/apache/tomcat/util/buf/MessageBytes.java
+++ b/java/org/apache/tomcat/util/buf/MessageBytes.java
@@ -47,14 +47,20 @@ public final class MessageBytes implements Cloneable,
Serializable {
private int type = T_NULL;
public static final int T_NULL = 0;
- /** getType() is T_STR if the the object used to create the MessageBytes
- was a String */
+ /**
+ * getType() is T_STR if the the object used to create the MessageBytes
+ * was a String.
+ */
public static final int T_STR = 1;
- /** getType() is T_BYTES if the the object used to create the MessageBytes
- was a byte[] */
+ /**
+ * getType() is T_BYTES if the the object used to create the MessageBytes
+ * was a byte[].
+ */
public static final int T_BYTES = 2;
- /** getType() is T_CHARS if the the object used to create the MessageBytes
- was a char[] */
+ /**
+ * getType() is T_CHARS if the the object used to create the MessageBytes
+ * was a char[].
+ */
public static final int T_CHARS = 3;
public static final char[] EMPTY_CHAR_ARRAY = new char[0];
diff --git a/java/org/apache/tomcat/util/digester/DocumentProperties.java
b/java/org/apache/tomcat/util/digester/DocumentProperties.java
index fd7f8ebf40..1e8029b448 100644
--- a/java/org/apache/tomcat/util/digester/DocumentProperties.java
+++ b/java/org/apache/tomcat/util/digester/DocumentProperties.java
@@ -17,7 +17,6 @@
package org.apache.tomcat.util.digester;
/**
- *
* A collection of interfaces, one per property, that enables the object being
* populated by the digester to signal to the digester that it supports the
* given property and that the digester should populate that property if
diff --git a/java/org/apache/tomcat/util/http/MimeHeaders.java
b/java/org/apache/tomcat/util/http/MimeHeaders.java
index ae94960489..375cb5071e 100644
--- a/java/org/apache/tomcat/util/http/MimeHeaders.java
+++ b/java/org/apache/tomcat/util/http/MimeHeaders.java
@@ -89,8 +89,9 @@ import org.apache.tomcat.util.res.StringManager;
* @author kevin seguin
*/
public class MimeHeaders {
- /** Initial size - should be == average number of headers per request
- * XXX make it configurable ( fine-tuning of web-apps )
+ /**
+ * Initial size - should be == average number of headers per request
+ * XXX make it configurable ( fine-tuning of web-apps )
*/
public static final int DEFAULT_HEADER_SIZE=8;
@@ -418,12 +419,10 @@ public class MimeHeaders {
}
-/** Enumerate the distinct header names.
- Each nextElement() is O(n) ( a comparison is
- done with all previous elements ).
-
- This is less frequent than add() -
- we want to keep add O(1).
+/**
+ * Enumerate the distinct header names. Each nextElement() is O(n) ( a
+ * comparison is done with all previous elements ). This is less frequent than
+ * add() - we want to keep add O(1).
*/
class NamesEnumerator implements Enumeration<String> {
private int pos;
@@ -472,8 +471,8 @@ class NamesEnumerator implements Enumeration<String> {
}
}
-/** Enumerate the values for a (possibly ) multiple
- value element.
+/**
+ * Enumerate the values for a (possibly ) multiple value element.
*/
class ValuesEnumerator implements Enumeration<String> {
private int pos;
diff --git a/java/org/apache/tomcat/util/http/Parameters.java
b/java/org/apache/tomcat/util/http/Parameters.java
index d233190ddb..a3a5046ae8 100644
--- a/java/org/apache/tomcat/util/http/Parameters.java
+++ b/java/org/apache/tomcat/util/http/Parameters.java
@@ -34,10 +34,6 @@ import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.log.UserDataHelper;
import org.apache.tomcat.util.res.StringManager;
-/**
- *
- * @author Costin Manolache
- */
public final class Parameters {
private static final Log log = LogFactory.getLog(Parameters.class);
@@ -172,7 +168,8 @@ public final class Parameters {
}
}
// -------------------- Processing --------------------
- /** Process the query string into parameters
+ /**
+ * Process the query string into parameters
*/
public void handleQueryParameters() {
if (didQueryParameters) {
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
index 53ec2d4861..2191c16754 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
@@ -27,7 +27,8 @@ import
org.apache.tomcat.util.http.fileupload.impl.SizeLimitExceededException;
* {@link FileUploadBase#getItemIterator(RequestContext)}.
*/
public interface FileItemIterator {
- /** Returns the maximum size of a single file. An {@link
FileSizeLimitExceededException}
+ /**
+ * Returns the maximum size of a single file. An {@link
FileSizeLimitExceededException}
* will be thrown, if there is an uploaded file, which is exceeding this
value.
* By default, this value will be copied from the {@link
FileUploadBase#getFileSizeMax()
* FileUploadBase} object, however, the user may replace the default value
with a
@@ -36,7 +37,8 @@ public interface FileItemIterator {
*/
long getFileSizeMax();
- /** Sets the maximum size of a single file. An {@link
FileSizeLimitExceededException}
+ /**
+ * Sets the maximum size of a single file. An {@link
FileSizeLimitExceededException}
* will be thrown, if there is an uploaded file, which is exceeding this
value.
* By default, this value will be copied from the {@link
FileUploadBase#getFileSizeMax()
* FileUploadBase} object, however, the user may replace the default value
with a
@@ -47,7 +49,8 @@ public interface FileItemIterator {
*/
void setFileSizeMax(long pFileSizeMax);
- /** Returns the maximum size of the complete HTTP request. A {@link
SizeLimitExceededException}
+ /**
+ * Returns the maximum size of the complete HTTP request. A {@link
SizeLimitExceededException}
* will be thrown, if the HTTP request will exceed this value.
* By default, this value will be copied from the {@link
FileUploadBase#getSizeMax()
* FileUploadBase} object, however, the user may replace the default value
with a
@@ -56,7 +59,8 @@ public interface FileItemIterator {
*/
long getSizeMax();
- /** Returns the maximum size of the complete HTTP request. A {@link
SizeLimitExceededException}
+ /**
+ * Returns the maximum size of the complete HTTP request. A {@link
SizeLimitExceededException}
* will be thrown, if the HTTP request will exceed this value.
* By default, this value will be copied from the {@link
FileUploadBase#getSizeMax()
* FileUploadBase} object, however, the user may replace the default value
with a
diff --git a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
index 6a4b4966c5..174c443772 100644
--- a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
+++ b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
@@ -118,7 +118,8 @@ public class BaseModelMBean implements DynamicMBean,
MBeanRegistration,
*/
protected BaseNotificationBroadcaster generalBroadcaster = null;
- /** Metadata for the mbean instance.
+ /**
+ * Metadata for the mbean instance.
*/
protected ManagedBean managedBean = null;
diff --git a/java/org/apache/tomcat/util/modeler/ManagedBean.java
b/java/org/apache/tomcat/util/modeler/ManagedBean.java
index 4ca7e58b44..807281fffa 100644
--- a/java/org/apache/tomcat/util/modeler/ManagedBean.java
+++ b/java/org/apache/tomcat/util/modeler/ManagedBean.java
@@ -76,8 +76,8 @@ public class ManagedBean implements java.io.Serializable {
private NotificationInfo notifications[] = new NotificationInfo[0];
protected String type = null;
- /** Constructor. Will add default attributes.
- *
+ /**
+ * Constructor. Will add default attributes.
*/
public ManagedBean() {
AttributeInfo ai=new AttributeInfo();
diff --git a/java/org/apache/tomcat/util/net/SSLSupport.java
b/java/org/apache/tomcat/util/net/SSLSupport.java
index 5bdf43619a..d1387ce192 100644
--- a/java/org/apache/tomcat/util/net/SSLSupport.java
+++ b/java/org/apache/tomcat/util/net/SSLSupport.java
@@ -147,7 +147,6 @@ public interface SSLSupport {
public String getProtocol() throws IOException;
/**
- *
* @return the list of SSL/TLS protocol versions requested by the client
*
* @throws IOException If an error occurs trying to obtain the client
@@ -156,7 +155,6 @@ public interface SSLSupport {
public String getRequestedProtocols() throws IOException;
/**
- *
* @return the list of SSL/TLS ciphers requested by the client
*
* @throws IOException If an error occurs trying to obtain the client
diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
index 7a21d2dffe..b2a1a790d3 100644
--- a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
@@ -35,18 +35,15 @@ import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
import org.apache.tomcat.util.res.StringManager;
-/** JSSESupport
-
- Concrete implementation class for JSSE
- Support classes.
-
- This will only work with JDK 1.2 and up since it
- depends on JDK 1.2's certificate support
-
- @author EKR
- @author Craig R. McClanahan
- Parts cribbed from JSSECertCompat
- Parts cribbed from CertificatesValve
+/**
+ * JSSESupport.
+ *
+ * Concrete implementation class for JSSE Support classes.
+ *
+ * @author EKR
+ * @author Craig R. McClanahan
+ * Parts cribbed from JSSECertCompat
+ * Parts cribbed from CertificatesValve
*/
public class JSSESupport implements SSLSupport, SSLSessionManager {
diff --git
a/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
b/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
index f68992072b..1b5ac740f1 100644
--- a/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
+++ b/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
@@ -261,7 +261,6 @@ public class WsRemoteEndpointImplServer extends
WsRemoteEndpointImplBase {
/**
- *
* @param t The throwable associated with any error that
* occurred
* @param useDispatch Should {@link SendHandler#onResult(SendResult)} be
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
index e48147eaa9..d63fa4b635 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
@@ -32,7 +32,6 @@ import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorDefinition;
/**
- *
* The DataSource proxy lets us implements methods that don't exist in the
current
* compiler JDK but might be methods that are part of a future JDK DataSource
interface.
* <br>
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
index 27dd8128ed..c4addeb7b5 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
@@ -29,7 +29,6 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.locks.ReentrantLock;
/**
- *
* A simple implementation of a blocking queue with fairness waiting.
* invocations to method poll(...) will get handed out in the order they were
received.
* Locking is fine grained, a shared lock is only used during the first level
of contention, waiting is done in a
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
index d691258ace..d6ac12e11b 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
@@ -367,7 +367,6 @@ public class PooledConnection implements
PooledConnectionMBean {
}
/**
- *
* @return true if connect() was called successfully and disconnect has
not yet been called
*/
@Override
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
index d336fae030..d800a1b9bc 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
@@ -487,9 +487,10 @@ public class SlowQueryReport extends AbstractQueryReport {
}
}
- /** Compare QueryStats by their lastInvocation value. QueryStats that
- * have never been updated, have a lastInvocation value of {@code 0}
- * which should be handled as the newest possible invocation.
+ /**
+ * Compare QueryStats by their lastInvocation value. QueryStats that have
+ * never been updated, have a lastInvocation value of {@code 0} which
should
+ * be handled as the newest possible invocation.
*/
// Public for unit tests
public static class QueryStatsComparator implements Comparator<QueryStats>
{
diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index 8157a6b36a..bc25876b03 100644
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -80,6 +80,7 @@
<!-- Javadoc Comments -->
<module name="InvalidJavadocPosition"/>
<module name="JavadocBlockTagLocation"/>
+ <module name="JavadocContentLocationCheck"/>
<!-- Miscellaneous -->
<!-- ~5500 errors
diff --git a/test/org/apache/catalina/filters/TesterHttpServletResponse.java
b/test/org/apache/catalina/filters/TesterHttpServletResponse.java
index e9e30423de..4f9c4f9d91 100644
--- a/test/org/apache/catalina/filters/TesterHttpServletResponse.java
+++ b/test/org/apache/catalina/filters/TesterHttpServletResponse.java
@@ -228,7 +228,6 @@ public class TesterHttpServletResponse implements
HttpServletResponse {
@Deprecated
public String encodeUrl(String url) { return null; }
/**
- *
* @throws IOException Never happens
*/
public void sendAcknowledgement() throws IOException {/* NOOP */}
diff --git a/test/org/apache/catalina/startup/BytesStreamer.java
b/test/org/apache/catalina/startup/BytesStreamer.java
index 05fac0d491..7e063afe2c 100644
--- a/test/org/apache/catalina/startup/BytesStreamer.java
+++ b/test/org/apache/catalina/startup/BytesStreamer.java
@@ -17,10 +17,7 @@
package org.apache.catalina.startup;
/**
- *
* Used by {@link TomcatBaseTest}
- *
- *
*/
public interface BytesStreamer {
/**
diff --git a/test/org/apache/catalina/startup/NoMappingParamServlet.java
b/test/org/apache/catalina/startup/NoMappingParamServlet.java
index ea32942c13..6e9278e902 100644
--- a/test/org/apache/catalina/startup/NoMappingParamServlet.java
+++ b/test/org/apache/catalina/startup/NoMappingParamServlet.java
@@ -26,10 +26,6 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-/**
- *
- * @author Peter Rossbach
- */
@WebServlet(name = "param1", initParams = {
@WebInitParam(name = "foo", value = "Hello"),
@WebInitParam(name = "bar", value = "World!") })
diff --git a/test/org/apache/catalina/startup/ParamServlet.java
b/test/org/apache/catalina/startup/ParamServlet.java
index 4deab7d0d8..d54fcb1929 100644
--- a/test/org/apache/catalina/startup/ParamServlet.java
+++ b/test/org/apache/catalina/startup/ParamServlet.java
@@ -26,10 +26,6 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-/**
- *
- * @author Peter Rossbach
- */
@WebServlet(value = "/annotation/overwrite", name = "param", initParams = {
@WebInitParam(name = "foo", value = "Hello"),
@WebInitParam(name = "bar", value = "World!") }, displayName =
"param", description = "param", largeIcon = "paramLarge.png", smallIcon =
"paramSmall.png", loadOnStartup = 0, asyncSupported = false)
diff --git a/test/org/apache/catalina/tribes/demos/EchoRpcTest.java
b/test/org/apache/catalina/tribes/demos/EchoRpcTest.java
index 658da95347..e58798fece 100644
--- a/test/org/apache/catalina/tribes/demos/EchoRpcTest.java
+++ b/test/org/apache/catalina/tribes/demos/EchoRpcTest.java
@@ -61,7 +61,6 @@ public class EchoRpcTest implements RpcCallback, Runnable {
}
/**
- *
* @param msg Serializable
* @param sender Member
* @return Serializable - null if no reply should be sent
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
