From e5738f9b6051be631ad4354768e455e11c3b452b Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 3 Sep 2010 18:35:59 +0000 Subject: [PATCH] White-space clean-up Reduce sequences of three or more blank lines to two blank lines git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@992409 13f79535-47bb-0310-9956-ffa450edef68 --- .../servlet/resources/javaee_web_services_1_3.xsd | 5 ++- java/org/apache/catalina/ContainerListener.java | 2 -- java/org/apache/catalina/LifecycleListener.java | 2 -- java/org/apache/catalina/SessionListener.java | 2 -- .../catalina/ant/jmx/JMXAccessorSetTask.java | 1 - .../catalina/authenticator/AuthenticatorBase.java | 2 -- java/org/apache/catalina/connector/Response.java | 3 +- .../catalina/core/ApplicationContextFacade.java | 1 - .../catalina/core/ApplicationFilterChain.java | 4 +-- .../apache/catalina/core/AsyncListenerWrapper.java | 3 +- .../org/apache/catalina/core/StandardPipeline.java | 5 ++- .../catalina/core/StandardThreadExecutor.java | 5 +-- java/org/apache/catalina/deploy/WebXml.java | 5 ++- java/org/apache/catalina/ha/ClusterRuleSet.java | 1 - java/org/apache/catalina/ha/ClusterSession.java | 3 +- .../apache/catalina/ha/session/DeltaManager.java | 1 - .../apache/catalina/ha/session/DeltaRequest.java | 1 - .../apache/catalina/ha/session/DeltaSession.java | 2 -- .../catalina/ha/session/SerializablePrincipal.java | 4 --- .../apache/catalina/ha/session/SessionMessage.java | 1 - .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 2 -- .../apache/catalina/loader/WebappClassLoader.java | 2 -- java/org/apache/catalina/mbeans/MBeanUtils.java | 5 ++- .../catalina/mbeans/ServerLifecycleListener.java | 4 --- .../apache/catalina/mbeans/mbeans-descriptors.xml | 2 -- java/org/apache/catalina/realm/JNDIRealm.java | 4 --- java/org/apache/catalina/realm/RealmBase.java | 2 -- .../apache/catalina/security/SecurityConfig.java | 2 -- java/org/apache/catalina/servlets/CGIServlet.java | 27 --------------- .../catalina/session/PersistentManagerBase.java | 4 --- .../apache/catalina/session/StandardSession.java | 3 -- java/org/apache/catalina/startup/Catalina.java | 2 -- java/org/apache/catalina/startup/Tomcat.java | 3 -- .../org/apache/catalina/tribes/ChannelMessage.java | 6 ++-- .../catalina/tribes/group/AbsoluteOrder.java | 3 +- .../apache/catalina/tribes/group/RpcChannel.java | 1 - .../interceptors/FragmentationInterceptor.java | 4 +-- .../group/interceptors/NonBlockingCoordinator.java | 9 ++--- .../group/interceptors/OrderInterceptor.java | 6 ++-- .../group/interceptors/TcpPingInterceptor.java | 2 -- .../org/apache/catalina/tribes/io/ChannelData.java | 5 ++- .../org/apache/catalina/tribes/io/XByteBuffer.java | 3 +- .../tribes/membership/McastServiceImpl.java | 3 +- .../catalina/tribes/tipis/LazyReplicatedMap.java | 9 +---- .../catalina/tribes/tipis/ReplicatedMapEntry.java | 6 ++-- .../catalina/tribes/transport/AbstractRxTask.java | 2 -- .../catalina/tribes/transport/PooledSender.java | 1 - .../tribes/transport/ReplicationTransmitter.java | 2 -- .../catalina/tribes/transport/bio/BioReceiver.java | 9 ++--- .../tribes/transport/bio/BioReplicationTask.java | 2 -- .../tribes/transport/nio/NioReplicationTask.java | 3 -- java/org/apache/catalina/tribes/util/Arrays.java | 6 +--- java/org/apache/catalina/util/DateTool.java | 1 - .../org/apache/catalina/valves/AccessLogValve.java | 4 --- java/org/apache/coyote/ajp/AjpProcessor.java | 6 ++-- .../coyote/http11/AbstractHttp11Processor.java | 5 --- .../apache/coyote/http11/AbstractInputBuffer.java | 4 --- .../apache/coyote/http11/AbstractOutputBuffer.java | 8 ----- .../apache/coyote/http11/Http11NioProtocol.java | 3 -- java/org/apache/coyote/http11/Http11Protocol.java | 2 -- .../coyote/http11/InternalNioInputBuffer.java | 6 +--- .../coyote/http11/InternalNioOutputBuffer.java | 3 -- .../apache/coyote/http11/InternalOutputBuffer.java | 8 ----- .../org/apache/jasper/compiler/BeanRepository.java | 2 -- .../apache/jasper/tagplugins/jstl/core/Import.java | 5 ++- java/org/apache/jasper/xmlparser/XMLChar.java | 3 -- java/org/apache/juli/logging/LogFactory.java | 5 --- java/org/apache/tomcat/util/bcel/Constants.java | 4 --- .../util/bcel/classfile/AnnotationDefault.java | 1 - .../tomcat/util/bcel/classfile/Attribute.java | 10 ------ .../util/bcel/classfile/ClassElementValue.java | 3 -- .../tomcat/util/bcel/classfile/ClassParser.java | 6 ---- .../apache/tomcat/util/bcel/classfile/Code.java | 27 --------------- .../tomcat/util/bcel/classfile/CodeException.java | 33 ------------------ .../tomcat/util/bcel/classfile/Constant.java | 9 ----- .../tomcat/util/bcel/classfile/ConstantCP.java | 12 ------- .../tomcat/util/bcel/classfile/ConstantClass.java | 12 ------- .../tomcat/util/bcel/classfile/ConstantDouble.java | 7 ---- .../util/bcel/classfile/ConstantFieldref.java | 3 -- .../tomcat/util/bcel/classfile/ConstantFloat.java | 7 ---- .../util/bcel/classfile/ConstantInteger.java | 7 ---- .../bcel/classfile/ConstantInterfaceMethodref.java | 3 -- .../tomcat/util/bcel/classfile/ConstantLong.java | 7 ---- .../util/bcel/classfile/ConstantMethodref.java | 3 -- .../util/bcel/classfile/ConstantNameAndType.java | 15 --------- .../tomcat/util/bcel/classfile/ConstantPool.java | 13 -------- .../tomcat/util/bcel/classfile/ConstantString.java | 10 ------ .../tomcat/util/bcel/classfile/ConstantUtf8.java | 9 ----- .../tomcat/util/bcel/classfile/ConstantValue.java | 9 ----- .../tomcat/util/bcel/classfile/Deprecated.java | 9 ----- .../tomcat/util/bcel/classfile/ElementValue.java | 1 - .../tomcat/util/bcel/classfile/ExceptionTable.java | 12 ------- .../apache/tomcat/util/bcel/classfile/Field.java | 21 ------------ .../tomcat/util/bcel/classfile/InnerClass.java | 30 ----------------- .../tomcat/util/bcel/classfile/InnerClasses.java | 6 ---- .../tomcat/util/bcel/classfile/JavaClass.java | 35 ++----------------- .../tomcat/util/bcel/classfile/LineNumber.java | 18 ---------- .../util/bcel/classfile/LineNumberTable.java | 10 ------ .../tomcat/util/bcel/classfile/LocalVariable.java | 39 ---------------------- .../util/bcel/classfile/LocalVariableTable.java | 7 ---- .../apache/tomcat/util/bcel/classfile/Method.java | 27 --------------- .../tomcat/util/bcel/classfile/PMGClass.java | 15 --------- .../tomcat/util/bcel/classfile/Signature.java | 9 ----- .../tomcat/util/bcel/classfile/SourceFile.java | 9 ----- .../tomcat/util/bcel/classfile/StackMap.java | 3 -- .../tomcat/util/bcel/classfile/StackMapEntry.java | 37 -------------------- .../tomcat/util/bcel/classfile/StackMapTable.java | 3 -- .../util/bcel/classfile/StackMapTableEntry.java | 37 -------------------- .../tomcat/util/bcel/classfile/StackMapType.java | 9 ----- .../tomcat/util/bcel/classfile/Synthetic.java | 9 ----- .../apache/tomcat/util/bcel/classfile/Unknown.java | 12 ------- .../apache/tomcat/util/bcel/classfile/Utility.java | 11 ------ .../apache/tomcat/util/bcel/util/ByteSequence.java | 2 -- java/org/apache/tomcat/util/buf/MessageBytes.java | 1 - java/org/apache/tomcat/util/digester/Digester.java | 3 -- .../org/apache/tomcat/util/http/CookieSupport.java | 3 +- java/org/apache/tomcat/util/http/MimeHeaders.java | 1 - .../tomcat/util/http/fileupload/FileUtils.java | 1 - .../tomcat/util/http/fileupload/IOUtils.java | 4 --- .../util/http/fileupload/disk/DiskFileItem.java | 2 -- .../apache/tomcat/util/modeler/BaseModelMBean.java | 4 --- java/org/apache/tomcat/util/modeler/Registry.java | 4 +-- .../apache/tomcat/util/net/AbstractEndpoint.java | 4 +-- java/org/apache/tomcat/util/net/AprEndpoint.java | 5 --- java/org/apache/tomcat/util/net/JIoEndpoint.java | 8 +---- java/org/apache/tomcat/util/net/NioEndpoint.java | 16 --------- .../apache/tomcat/util/net/SocketProperties.java | 3 +- java/org/apache/tomcat/util/net/URL.java | 3 -- .../tomcat/util/threads/ThreadPoolExecutor.java | 3 +- .../webapps/cometd/examples/simplechat/ticker.html | 2 -- .../apache/tomcat/jdbc/pool/DataSourceProxy.java | 3 -- .../apache/tomcat/jdbc/pool/PoolProperties.java | 5 ++- .../apache/tomcat/jdbc/pool/PooledConnection.java | 4 +-- .../jdbc/pool/interceptor/ResetAbandonedTimer.java | 3 +- .../jdbc/pool/interceptor/SlowQueryReport.java | 15 ++------- .../jdbc/pool/interceptor/SlowQueryReportJmx.java | 9 ++--- .../jdbc/pool/interceptor/StatementCache.java | 3 +- .../tomcat/jdbc/pool/jmx/ConnectionPool.java | 11 +++--- .../jdbc/pool/interceptor/TestInterceptor.java | 5 ++- .../apache/tomcat/jdbc/test/BorrowWaitTest.java | 6 ++-- .../apache/tomcat/jdbc/test/ConnectCountTest.java | 9 ++--- .../tomcat/jdbc/test/TestConnectionState.java | 2 -- .../tomcat/jdbc/test/TestInterceptorShortName.java | 3 +- .../tomcat/jdbc/test/TestStatementCache.java | 2 -- .../apache/tomcat/jdbc/test/TwoDataSources.java | 3 +- .../org/apache/tomcat/lite/http/BaseMapper.java | 1 - .../apache/tomcat/lite/http/Http11Connection.java | 6 ++-- .../org/apache/tomcat/lite/http/HttpChannel.java | 6 ++-- .../tomcat/lite/http/HttpConnectionPool.java | 4 +-- .../org/apache/tomcat/lite/http/HttpMessage.java | 3 +- .../org/apache/tomcat/lite/http/HttpRequest.java | 5 ++- .../apache/tomcat/lite/http/SpdyConnection.java | 1 - .../apache/tomcat/lite/io/BufferedIOReader.java | 1 - .../java/org/apache/tomcat/lite/io/CBucket.java | 2 -- .../java/org/apache/tomcat/lite/io/CBuffer.java | 1 - .../java/org/apache/tomcat/lite/io/IOBuffer.java | 4 +-- .../java/org/apache/tomcat/lite/io/IOWriter.java | 3 +- .../java/org/apache/tomcat/lite/io/NioThread.java | 6 ++-- .../org/apache/tomcat/lite/io/SocketConnector.java | 1 - .../org/apache/tomcat/lite/io/SocketIOChannel.java | 5 ++- .../org/apache/tomcat/lite/io/jsse/SslChannel.java | 1 - .../org/apache/tomcat/lite/proxy/SocksServer.java | 3 +- .../test/org/apache/coyote/lite/Tomcat.java | 3 -- .../apache/tomcat/lite/http/HttpChannelTest.java | 3 +- .../org/apache/tomcat/lite/io/UEncoderTest.java | 3 +- .../tomcat/test/watchdog/CookieController.java | 4 --- .../tomcat/test/watchdog/WatchdogHttpClient.java | 10 ++---- .../catalina/tribes/demos/CoordinationDemo.java | 6 ++-- .../org/apache/catalina/tribes/demos/LoadTest.java | 12 +++---- .../interceptors/TestNonBlockingCoordinator.java | 5 +-- .../test/interceptors/TestOrderInterceptor.java | 5 +-- .../tribes/test/io/TestSenderConnections.java | 1 - test/org/apache/el/TestELEvaluation.java | 6 ++-- webapps/docs/cluster-howto.xml | 5 --- webapps/docs/config/context.xml | 1 - .../WEB-INF/classes/async/AsyncStockServlet.java | 5 +-- .../examples/WEB-INF/classes/cal/JspCalendar.java | 3 -- .../examples/WEB-INF/classes/examples/LogTag.java | 4 +-- .../WEB-INF/classes/examples/ShowSource.java | 4 +-- webapps/examples/jsp/cal/cal1.jsp | 2 -- 180 files changed, 102 insertions(+), 1026 deletions(-) diff --git a/java/javax/servlet/resources/javaee_web_services_1_3.xsd b/java/javax/servlet/resources/javaee_web_services_1_3.xsd index e72e4e6c5..cd97c91fe 100644 --- a/java/javax/servlet/resources/javaee_web_services_1_3.xsd +++ b/java/javax/servlet/resources/javaee_web_services_1_3.xsd @@ -557,9 +557,8 @@ Example: EmployeeService - - - + + ]]> diff --git a/java/org/apache/catalina/ContainerListener.java b/java/org/apache/catalina/ContainerListener.java index 45aa13abb..edce3a3fe 100644 --- a/java/org/apache/catalina/ContainerListener.java +++ b/java/org/apache/catalina/ContainerListener.java @@ -19,8 +19,6 @@ package org.apache.catalina; - - /** * Interface defining a listener for significant Container generated events. * Note that "container start" and "container stop" events are normally diff --git a/java/org/apache/catalina/LifecycleListener.java b/java/org/apache/catalina/LifecycleListener.java index faf2d0916..741bf5b34 100644 --- a/java/org/apache/catalina/LifecycleListener.java +++ b/java/org/apache/catalina/LifecycleListener.java @@ -19,8 +19,6 @@ package org.apache.catalina; - - /** * Interface defining a listener for significant events (including "component * start" and "component stop" generated by a component that implements the diff --git a/java/org/apache/catalina/SessionListener.java b/java/org/apache/catalina/SessionListener.java index e9009c41a..51bae44f2 100644 --- a/java/org/apache/catalina/SessionListener.java +++ b/java/org/apache/catalina/SessionListener.java @@ -19,8 +19,6 @@ package org.apache.catalina; - - /** * Interface defining a listener for significant Session generated events. * diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java index 5f0593080..ae7e3eb6c 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java @@ -193,7 +193,6 @@ public class JMXAccessorSetTask extends JMXAccessorTask { attribute, realValue)); return null; } - /** diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/java/org/apache/catalina/authenticator/AuthenticatorBase.java index 8d4fe6b4f..6d8eb7d22 100644 --- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java +++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java @@ -567,8 +567,6 @@ public abstract class AuthenticatorBase extends ValveBase // ------------------------------------------------------ Protected Methods - - /** * Associate the specified single sign on identifier with the * specified Session. diff --git a/java/org/apache/catalina/connector/Response.java b/java/org/apache/catalina/connector/Response.java index ae4bd1c08..1ff0327db 100644 --- a/java/org/apache/catalina/connector/Response.java +++ b/java/org/apache/catalina/connector/Response.java @@ -819,8 +819,7 @@ public class Response isCharacterEncodingSet = true; } - - + /** * Set the Locale that is appropriate for this response, including * setting the appropriate character encoding. diff --git a/java/org/apache/catalina/core/ApplicationContextFacade.java b/java/org/apache/catalina/core/ApplicationContextFacade.java index 9efef6911..8cb5c850d 100644 --- a/java/org/apache/catalina/core/ApplicationContextFacade.java +++ b/java/org/apache/catalina/core/ApplicationContextFacade.java @@ -129,7 +129,6 @@ public final class ApplicationContextFacade * Wrapped application context. */ private ApplicationContext context = null; - // ------------------------------------------------- ServletContext Methods diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java b/java/org/apache/catalina/core/ApplicationFilterChain.java index 54a947893..81b3fc716 100644 --- a/java/org/apache/catalina/core/ApplicationFilterChain.java +++ b/java/org/apache/catalina/core/ApplicationFilterChain.java @@ -160,8 +160,7 @@ final class ApplicationFilterChain implements FilterChain, CometFilterChain { */ private static Class[] classTypeUsedInEvent = new Class[] { CometEvent.class }; - - + // ---------------------------------------------------- FilterChain Methods @@ -514,7 +513,6 @@ final class ApplicationFilterChain implements FilterChain, CometFilterChain { // -------------------------------------------------------- Package Methods - /** * Add a filter to the set of filters that will be executed in this chain. * diff --git a/java/org/apache/catalina/core/AsyncListenerWrapper.java b/java/org/apache/catalina/core/AsyncListenerWrapper.java index f9dd98063..b4f64f9d4 100644 --- a/java/org/apache/catalina/core/AsyncListenerWrapper.java +++ b/java/org/apache/catalina/core/AsyncListenerWrapper.java @@ -54,7 +54,6 @@ public class AsyncListenerWrapper { public void setListener(AsyncListener listener) { this.listener = listener; } - - + } diff --git a/java/org/apache/catalina/core/StandardPipeline.java b/java/org/apache/catalina/core/StandardPipeline.java index 5e703cc50..d5da4839a 100644 --- a/java/org/apache/catalina/core/StandardPipeline.java +++ b/java/org/apache/catalina/core/StandardPipeline.java @@ -231,9 +231,8 @@ public class StandardPipeline extends LifecycleBase sb.append(']'); return sb.toString(); } - - - + + // ------------------------------------------------------- Pipeline Methods diff --git a/java/org/apache/catalina/core/StandardThreadExecutor.java b/java/org/apache/catalina/core/StandardThreadExecutor.java index 28f77545b..bc02f0ba4 100644 --- a/java/org/apache/catalina/core/StandardThreadExecutor.java +++ b/java/org/apache/catalina/core/StandardThreadExecutor.java @@ -89,9 +89,8 @@ public class StandardThreadExecutor extends LifecycleMBeanBase public StandardThreadExecutor() { //empty constructor for the digester } - - + // ---------------------------------------------- Public Methods @Override @@ -273,7 +272,6 @@ public class StandardThreadExecutor extends LifecycleMBeanBase } - @Override public boolean resizePool(int corePoolSize, int maximumPoolSize) { if (executor == null) @@ -285,7 +283,6 @@ public class StandardThreadExecutor extends LifecycleMBeanBase } - @Override public boolean resizeQueue(int capacity) { return false; diff --git a/java/org/apache/catalina/deploy/WebXml.java b/java/org/apache/catalina/deploy/WebXml.java index 8f8cdf984..f2b29c896 100644 --- a/java/org/apache/catalina/deploy/WebXml.java +++ b/java/org/apache/catalina/deploy/WebXml.java @@ -547,9 +547,8 @@ public class WebXml { private URL uRL = null; public void setURL(URL url) { this.uRL = url; } public URL getURL() { return uRL; } - - - + + @Override public String toString() { StringBuilder buf = new StringBuilder(32); diff --git a/java/org/apache/catalina/ha/ClusterRuleSet.java b/java/org/apache/catalina/ha/ClusterRuleSet.java index 167c2af62..153d0c87b 100644 --- a/java/org/apache/catalina/ha/ClusterRuleSet.java +++ b/java/org/apache/catalina/ha/ClusterRuleSet.java @@ -94,7 +94,6 @@ public class ClusterRuleSet extends RuleSetBase { digester.addSetNext(prefix + "Manager", "setManagerTemplate", "org.apache.catalina.ha.ClusterManager"); - digester.addObjectCreate(prefix + "Channel", diff --git a/java/org/apache/catalina/ha/ClusterSession.java b/java/org/apache/catalina/ha/ClusterSession.java index 742c19ee8..eb124bb6f 100644 --- a/java/org/apache/catalina/ha/ClusterSession.java +++ b/java/org/apache/catalina/ha/ClusterSession.java @@ -35,7 +35,6 @@ public interface ClusterSession extends Session, HttpSession { * @param primarySession Flag value */ public void setPrimarySession(boolean primarySession); - - + } diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java index dc3614803..949d42490 100644 --- a/java/org/apache/catalina/ha/session/DeltaManager.java +++ b/java/org/apache/catalina/ha/session/DeltaManager.java @@ -683,7 +683,6 @@ public class DeltaManager extends ClusterManagerBase{ } - /** * Save any currently active sessions in the appropriate persistence diff --git a/java/org/apache/catalina/ha/session/DeltaRequest.java b/java/org/apache/catalina/ha/session/DeltaRequest.java index 00ddc0b13..317fc8979 100644 --- a/java/org/apache/catalina/ha/session/DeltaRequest.java +++ b/java/org/apache/catalina/ha/session/DeltaRequest.java @@ -257,7 +257,6 @@ public class DeltaRequest implements Externalizable { actions.addLast(info); }//for } - public void writeExternal(java.io.ObjectOutput out ) throws java.io.IOException { diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java b/java/org/apache/catalina/ha/session/DeltaSession.java index f9fc58130..e068922f7 100644 --- a/java/org/apache/catalina/ha/session/DeltaSession.java +++ b/java/org/apache/catalina/ha/session/DeltaSession.java @@ -530,7 +530,6 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus // ----------------------------------------------HttpSession Public Methods - /** * Remove the object bound with the specified name from this session. If the * session does not have an object bound with this name, this method does @@ -759,7 +758,6 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus // -------------------------------------------------------- Private Methods - /** * Return the value of an attribute without a check for validity. diff --git a/java/org/apache/catalina/ha/session/SerializablePrincipal.java b/java/org/apache/catalina/ha/session/SerializablePrincipal.java index c30126d3e..65081e72a 100644 --- a/java/org/apache/catalina/ha/session/SerializablePrincipal.java +++ b/java/org/apache/catalina/ha/session/SerializablePrincipal.java @@ -153,8 +153,6 @@ public class SerializablePrincipal implements java.io.Serializable { } - - /** * The set of roles associated with this user. */ @@ -173,8 +171,6 @@ public class SerializablePrincipal implements java.io.Serializable { // --------------------------------------------------------- Public Methods - - /** * Return a String representation of this object, which exposes only * information that should be public. diff --git a/java/org/apache/catalina/ha/session/SessionMessage.java b/java/org/apache/catalina/ha/session/SessionMessage.java index 2fb1af2e0..a1cb7850e 100644 --- a/java/org/apache/catalina/ha/session/SessionMessage.java +++ b/java/org/apache/catalina/ha/session/SessionMessage.java @@ -100,7 +100,6 @@ public interface SessionMessage extends ClusterMessage, java.io.Serializable * @return the session ID for the session */ public String getSessionID(); - }//SessionMessage diff --git a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java index 63e16a07d..f5dea45c3 100644 --- a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java +++ b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java @@ -896,8 +896,6 @@ public class SimpleTcpCluster extends LifecycleBase } - - // ------------------------------------------------------------- deprecated /** diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java index a90a3a813..baba0797c 100644 --- a/java/org/apache/catalina/loader/WebappClassLoader.java +++ b/java/org/apache/catalina/loader/WebappClassLoader.java @@ -171,8 +171,6 @@ public class WebappClassLoader } } - - // ------------------------------------------------------- Static Variables diff --git a/java/org/apache/catalina/mbeans/MBeanUtils.java b/java/org/apache/catalina/mbeans/MBeanUtils.java index a5ca8ffae..896e06bd1 100644 --- a/java/org/apache/catalina/mbeans/MBeanUtils.java +++ b/java/org/apache/catalina/mbeans/MBeanUtils.java @@ -616,9 +616,8 @@ public class MBeanUtils { return (name); } - - - + + /** * Create an ObjectName for this * Engine object. diff --git a/java/org/apache/catalina/mbeans/ServerLifecycleListener.java b/java/org/apache/catalina/mbeans/ServerLifecycleListener.java index aaccccae1..ee4e5a216 100644 --- a/java/org/apache/catalina/mbeans/ServerLifecycleListener.java +++ b/java/org/apache/catalina/mbeans/ServerLifecycleListener.java @@ -597,8 +597,6 @@ public class ServerLifecycleListener } - - /** * Deregister the MBeans for the specified Connector and its nested * components. @@ -933,8 +931,6 @@ public class ServerLifecycleListener } - - /** * Process a property change event on a Container. * diff --git a/java/org/apache/catalina/mbeans/mbeans-descriptors.xml b/java/org/apache/catalina/mbeans/mbeans-descriptors.xml index dbcbc41dc..85cf0165f 100644 --- a/java/org/apache/catalina/mbeans/mbeans-descriptors.xml +++ b/java/org/apache/catalina/mbeans/mbeans-descriptors.xml @@ -241,8 +241,6 @@ - - null. diff --git a/java/org/apache/catalina/security/SecurityConfig.java b/java/org/apache/catalina/security/SecurityConfig.java index 06d0774eb..9fcd4dd04 100644 --- a/java/org/apache/catalina/security/SecurityConfig.java +++ b/java/org/apache/catalina/security/SecurityConfig.java @@ -131,5 +131,3 @@ public final class SecurityConfig{ } - - diff --git a/java/org/apache/catalina/servlets/CGIServlet.java b/java/org/apache/catalina/servlets/CGIServlet.java index 959862ce6..012b9c514 100644 --- a/java/org/apache/catalina/servlets/CGIServlet.java +++ b/java/org/apache/catalina/servlets/CGIServlet.java @@ -323,7 +323,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Prints out important Servlet API and container information * @@ -528,11 +527,9 @@ public final class CGIServlet extends HttpServlet { out.println("
"); - } - /** * Provides CGI Gateway service -- delegates to doGet * @@ -552,7 +549,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Provides CGI Gateway service * @@ -702,7 +698,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Uses the ServletContext to set some CGI variables * @@ -716,7 +711,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Uses the HttpServletRequest to set most CGI variables * @@ -1244,7 +1238,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Gets derived command string * @@ -1256,7 +1249,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Gets derived CGI working directory * @@ -1268,7 +1260,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Gets derived CGI environment * @@ -1280,7 +1271,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Gets derived CGI query parameters * @@ -1292,7 +1282,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Gets validity status * @@ -1305,7 +1294,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Converts null strings to blank strings ("") * @@ -1318,7 +1306,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Converts null strings to another string * @@ -1333,7 +1320,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Converts blank strings to another string * @@ -1350,14 +1336,9 @@ public final class CGIServlet extends HttpServlet { } - } //class CGIEnvironment - - - - /** * Encapsulates the knowledge of how to run a CGI script, given the * script's desired environment and (optionally) input/output streams @@ -1407,8 +1388,6 @@ public final class CGIServlet extends HttpServlet { private boolean readyToRun = false; - - /** * Creates a CGIRunner and initializes its environment, working * directory, and query parameters. @@ -1433,7 +1412,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Checks & sets ready status */ @@ -1450,7 +1428,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Gets ready status * @@ -1462,7 +1439,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Sets HttpServletResponse object used to set headers and send * output to @@ -1476,7 +1452,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Sets standard input to be passed on to the invoked cgi script * @@ -1489,7 +1464,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Converts a Hashtable to a String array by converting each * key/value pair in the Hashtable to a String in the form @@ -1516,7 +1490,6 @@ public final class CGIServlet extends HttpServlet { } - /** * Executes a CGI script with the desired environment, current working * directory, and input/output streams diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java b/java/org/apache/catalina/session/PersistentManagerBase.java index 21004d0b1..814b80513 100644 --- a/java/org/apache/catalina/session/PersistentManagerBase.java +++ b/java/org/apache/catalina/session/PersistentManagerBase.java @@ -188,9 +188,6 @@ public abstract class PersistentManagerBase extends ManagerBase { // ------------------------------------------------------------- Properties - - - /** * Indicates how many seconds old a session can get, after its last use in a @@ -360,7 +357,6 @@ public abstract class PersistentManagerBase extends ManagerBase { } - /** * Indicates whether sessions are saved when the Manager is shut down * properly. This requires the unload() method to be called. diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java index 166becdeb..9e3564d5a 100644 --- a/java/org/apache/catalina/session/StandardSession.java +++ b/java/org/apache/catalina/session/StandardSession.java @@ -1236,7 +1236,6 @@ public class StandardSession } - /** * Bind an object to this session, using the specified name. If an object * of the same name is already bound to this session, the object is @@ -1671,7 +1670,6 @@ public class StandardSession ((StandardContext) context).fireContainerEvent(type, data); } } - /** @@ -1853,5 +1851,4 @@ final class StandardSessionContext implements HttpSessionContext { } - } diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java index 3c87d8527..a47b245c1 100644 --- a/java/org/apache/catalina/startup/Catalina.java +++ b/java/org/apache/catalina/startup/Catalina.java @@ -350,8 +350,6 @@ public class Catalina { digester.addSetNext("Server/Service/Connector", "addConnector", "org.apache.catalina.connector.Connector"); - - digester.addObjectCreate("Server/Service/Connector/Listener", diff --git a/java/org/apache/catalina/startup/Tomcat.java b/java/org/apache/catalina/startup/Tomcat.java index f1b5588b2..903041fa4 100644 --- a/java/org/apache/catalina/startup/Tomcat.java +++ b/java/org/apache/catalina/startup/Tomcat.java @@ -499,10 +499,7 @@ public class Tomcat { return ctx; } - - - // ---------- Helper methods and classes ------------------- /** diff --git a/java/org/apache/catalina/tribes/ChannelMessage.java b/java/org/apache/catalina/tribes/ChannelMessage.java index 15af28978..4596b81b3 100644 --- a/java/org/apache/catalina/tribes/ChannelMessage.java +++ b/java/org/apache/catalina/tribes/ChannelMessage.java @@ -28,10 +28,8 @@ import org.apache.catalina.tribes.io.XByteBuffer; * */ public interface ChannelMessage extends Serializable { - - - - + + /** * Get the address that this message originated from. * Almost always Channel.getLocalMember(boolean)
diff --git a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java index 9f48f90b1..6d3f59676 100644 --- a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java +++ b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java @@ -50,8 +50,7 @@ public class AbsoluteOrder { super(); } - - + public static void absoluteOrder(Member[] members) { if ( members == null || members.length == 0 ) return; Arrays.sort(members,comp); diff --git a/java/org/apache/catalina/tribes/group/RpcChannel.java b/java/org/apache/catalina/tribes/group/RpcChannel.java index 8f44f06f8..0fb774bd1 100644 --- a/java/org/apache/catalina/tribes/group/RpcChannel.java +++ b/java/org/apache/catalina/tribes/group/RpcChannel.java @@ -174,7 +174,6 @@ public class RpcChannel implements ChannelListener{ public void setRpcId(byte[] rpcId) { this.rpcId = rpcId; } - /** diff --git a/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java index c64837fc2..1ebdd004f 100644 --- a/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java +++ b/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java @@ -153,7 +153,6 @@ public class FragmentationInterceptor extends ChannelInterceptorBase { super.heartbeat(); } - public int getMaxSize() { return maxSize; @@ -215,8 +214,7 @@ public class FragmentationInterceptor extends ChannelInterceptorBase { return (System.currentTimeMillis()-received)>expire; } - - + } public static class FragKey { diff --git a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java index 764d2ba22..197fe742f 100644 --- a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java +++ b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java @@ -635,10 +635,8 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase { //============================================================================================================ // HELPER CLASSES FOR COORDINATION //============================================================================================================ - - - - + + public static class CoordinationMessage { //X{A-ldr, A-src, mbrs-A,B,C,D} protected XByteBuffer buf; @@ -848,8 +846,5 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase { } } - - - } \ No newline at end of file diff --git a/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java index 71c771937..778a774dd 100644 --- a/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java +++ b/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java @@ -28,7 +28,6 @@ import org.apache.catalina.tribes.group.InterceptorPayload; import org.apache.catalina.tribes.io.XByteBuffer; - /** * * The order interceptor guarantees that messages are received in the same order they were @@ -301,9 +300,8 @@ public class OrderInterceptor extends ChannelInterceptorBase { public int getMsgNr() { return msgNr; } - - - + + } public void setExpire(long expire) { diff --git a/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java index 7e056a95e..26d67620b 100644 --- a/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java +++ b/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java @@ -179,7 +179,5 @@ public class TcpPingInterceptor extends ChannelInterceptorBase { } } - - } diff --git a/java/org/apache/catalina/tribes/io/ChannelData.java b/java/org/apache/catalina/tribes/io/ChannelData.java index 085c2f81e..9984eb7b3 100644 --- a/java/org/apache/catalina/tribes/io/ChannelData.java +++ b/java/org/apache/catalina/tribes/io/ChannelData.java @@ -76,9 +76,8 @@ public class ChannelData implements ChannelMessage { public ChannelData(boolean generateUUID) { if ( generateUUID ) generateUUID(); } - - - + + /** * Creates a new channel data object with data * @param uniqueId - unique message id diff --git a/java/org/apache/catalina/tribes/io/XByteBuffer.java b/java/org/apache/catalina/tribes/io/XByteBuffer.java index 0a940d37b..71f2d6331 100644 --- a/java/org/apache/catalina/tribes/io/XByteBuffer.java +++ b/java/org/apache/catalina/tribes/io/XByteBuffer.java @@ -377,8 +377,7 @@ public class XByteBuffer byte[] result = new byte[length]; return createDataPackage(data,0,data.length,result,0); } - - + // public static void fillDataPackage(byte[] data, int doff, int dlength, XByteBuffer buf) { // int pkglen = getDataPackageLength(dlength); diff --git a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java index fc417ac17..28d1c47c1 100644 --- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java +++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java @@ -238,8 +238,7 @@ public class McastServiceImpl socket.setTimeToLive(mcastTTL); } } - - + /** * Start the service diff --git a/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java index bbe508d0a..7d0a06294 100644 --- a/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java +++ b/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java @@ -65,9 +65,8 @@ import org.apache.juli.logging.LogFactory; */ public class LazyReplicatedMap extends AbstractReplicatedMap { private static final Log log = LogFactory.getLog(LazyReplicatedMap.class); - - + //------------------------------------------------------------------------------ // CONSTRUCTORS / DESTRUCTORS //------------------------------------------------------------------------------ @@ -105,9 +104,6 @@ public class LazyReplicatedMap extends AbstractReplicatedMap { } - - - //------------------------------------------------------------------------------ // METHODS TO OVERRIDE //------------------------------------------------------------------------------ @@ -181,9 +177,6 @@ public class LazyReplicatedMap extends AbstractReplicatedMap { } while ( !success && (firstIdx!=nextIdx)); return backup; } - - - } \ No newline at end of file diff --git a/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java b/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java index ad0049803..b44c60681 100644 --- a/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java +++ b/java/org/apache/catalina/tribes/tipis/ReplicatedMapEntry.java @@ -117,8 +117,6 @@ public interface ReplicatedMapEntry extends Serializable { * @param version long */ public void setVersion(long version); - - - - + + } \ No newline at end of file diff --git a/java/org/apache/catalina/tribes/transport/AbstractRxTask.java b/java/org/apache/catalina/tribes/transport/AbstractRxTask.java index b63352b44..9bedf1b62 100644 --- a/java/org/apache/catalina/tribes/transport/AbstractRxTask.java +++ b/java/org/apache/catalina/tribes/transport/AbstractRxTask.java @@ -20,8 +20,6 @@ package org.apache.catalina.tribes.transport; import org.apache.catalina.tribes.io.ListenCallback; - - /** * @author Filip Hanik * @version $Id$ diff --git a/java/org/apache/catalina/tribes/transport/PooledSender.java b/java/org/apache/catalina/tribes/transport/PooledSender.java index 8df3c0ead..ca20adc30 100644 --- a/java/org/apache/catalina/tribes/transport/PooledSender.java +++ b/java/org/apache/catalina/tribes/transport/PooledSender.java @@ -206,7 +206,6 @@ public abstract class PooledSender extends AbstractSender implements MultiPointS notinuse.clear(); inuse.clear(); notify(); - } diff --git a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java index 85e8d6ef0..26e3a0dcf 100644 --- a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java +++ b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java @@ -44,7 +44,6 @@ public class ReplicationTransmitter implements ChannelSender { */ protected static final StringManager sm = StringManager.getManager(Constants.Package); - public ReplicationTransmitter() { } @@ -129,6 +128,5 @@ public class ReplicationTransmitter implements ChannelSender { // ------------------------------------------------------------- protected - } diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java index 6fa722c3e..75e52360c 100644 --- a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java +++ b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java @@ -93,9 +93,7 @@ public class BioReceiver extends ReceiverBase implements Runnable { super.stop(); } - - - + protected void bind() throws IOException { // allocate an unbound server socket channel serverSocket = new ServerSocket(); @@ -103,9 +101,8 @@ public class BioReceiver extends ReceiverBase implements Runnable { //serverSocket.bind(new InetSocketAddress(getBind(), getTcpListenPort())); bind(serverSocket,getPort(),getAutoBind()); } - - - + + public void run() { try { listen(); diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java index c95f3fdb6..9a8d2ba80 100644 --- a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java +++ b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java @@ -138,8 +138,6 @@ public class BioReplicationTask extends AbstractRxTask { } - - /** * send a reply-acknowledgment (6,2,3) * @param command diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java index 2b26e99c4..5575b7b65 100644 --- a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java +++ b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java @@ -291,9 +291,6 @@ public class NioReplicationTask extends AbstractRxTask { } - - - /** * send a reply-acknowledgement (6,2,3), sends it doing a busy write, the ACK is so small * that it should always go to the buffer diff --git a/java/org/apache/catalina/tribes/util/Arrays.java b/java/org/apache/catalina/tribes/util/Arrays.java index 7f51df550..6706f10f8 100644 --- a/java/org/apache/catalina/tribes/util/Arrays.java +++ b/java/org/apache/catalina/tribes/util/Arrays.java @@ -216,8 +216,7 @@ public class Arrays { return result; } - - + public static byte[] convert(String s) { try { return s.getBytes("ISO-8859-1"); @@ -228,7 +227,4 @@ public class Arrays { } - - - } \ No newline at end of file diff --git a/java/org/apache/catalina/util/DateTool.java b/java/org/apache/catalina/util/DateTool.java index b7617343a..b68423be1 100644 --- a/java/org/apache/catalina/util/DateTool.java +++ b/java/org/apache/catalina/util/DateTool.java @@ -93,7 +93,6 @@ public class DateTool { } }; - public final static ThreadLocal rfc1036Format = new ThreadLocal() { @Override diff --git a/java/org/apache/catalina/valves/AccessLogValve.java b/java/org/apache/catalina/valves/AccessLogValve.java index c3a614ba4..ea1feac2f 100644 --- a/java/org/apache/catalina/valves/AccessLogValve.java +++ b/java/org/apache/catalina/valves/AccessLogValve.java @@ -954,8 +954,6 @@ public class AccessLogValve extends ValveBase implements AccessLog { * write date and time, in Common Log Format - %t */ protected class DateAndTimeElement implements AccessLogElement { - - public void addElement(StringBuilder buf, Date date, Request request, @@ -1305,8 +1303,6 @@ public class AccessLogValve extends ValveBase implements AccessLog { } - - /** * parse pattern string and create the array of AccessLogElement */ diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java index 2bb7eea41..906c5d483 100644 --- a/java/org/apache/coyote/ajp/AjpProcessor.java +++ b/java/org/apache/coyote/ajp/AjpProcessor.java @@ -535,10 +535,8 @@ public class AjpProcessor implements ActionHook { output = null; return SocketState.CLOSED; } - - - - + + } // ----------------------------------------------------- ActionHook Methods diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java index f399d2afc..e29638bc1 100644 --- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java +++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java @@ -150,7 +150,6 @@ public abstract class AbstractHttp11Processor { protected String localName = null; - /** * Local port to which the socket is connected */ @@ -365,10 +364,7 @@ public abstract class AbstractHttp11Processor { } return "off"; } - - - /** * General use method @@ -827,5 +823,4 @@ public abstract class AbstractHttp11Processor { } - } diff --git a/java/org/apache/coyote/http11/AbstractInputBuffer.java b/java/org/apache/coyote/http11/AbstractInputBuffer.java index 744c2dfc0..f023fd236 100644 --- a/java/org/apache/coyote/http11/AbstractInputBuffer.java +++ b/java/org/apache/coyote/http11/AbstractInputBuffer.java @@ -39,8 +39,6 @@ public abstract class AbstractInputBuffer implements InputBuffer{ // ----------------------------------------------------------- Constructors - - // -------------------------------------------------------------- Variables @@ -229,8 +227,6 @@ public abstract class AbstractInputBuffer implements InputBuffer{ this.swallowInput = swallowInput; } - - // --------------------------------------------------------- Public Methods diff --git a/java/org/apache/coyote/http11/AbstractOutputBuffer.java b/java/org/apache/coyote/http11/AbstractOutputBuffer.java index abefa16f5..6aa166607 100644 --- a/java/org/apache/coyote/http11/AbstractOutputBuffer.java +++ b/java/org/apache/coyote/http11/AbstractOutputBuffer.java @@ -72,7 +72,6 @@ public abstract class AbstractOutputBuffer implements OutputBuffer{ protected int pos; - /** * Filter library. * Note: Filter[0] is always the "chunked" filter. @@ -114,9 +113,6 @@ public abstract class AbstractOutputBuffer implements OutputBuffer{ // ------------------------------------------------------------- Properties - - - /** * Add an output filter to the filter library. */ @@ -178,8 +174,6 @@ public abstract class AbstractOutputBuffer implements OutputBuffer{ } - - // --------------------------------------------------- OutputBuffer Methods @@ -386,7 +380,6 @@ public abstract class AbstractOutputBuffer implements OutputBuffer{ } } - /** @@ -583,5 +576,4 @@ public abstract class AbstractOutputBuffer implements OutputBuffer{ } - } diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java index 0014ebe1f..beb3bcab0 100644 --- a/java/org/apache/coyote/http11/Http11NioProtocol.java +++ b/java/org/apache/coyote/http11/Http11NioProtocol.java @@ -116,7 +116,6 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol { log.info(sm.getString("http11protocol.start", getName())); } - // -------------------- Properties-------------------- @@ -474,8 +473,6 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol { } } - - } diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java index 1cdb5cc39..ecac665f8 100644 --- a/java/org/apache/coyote/http11/Http11Protocol.java +++ b/java/org/apache/coyote/http11/Http11Protocol.java @@ -158,9 +158,7 @@ public class Http11Protocol extends AbstractHttp11JsseProtocol { } // ------------------------------------------------------------- Properties - - /** * Name of the socket factory. */ diff --git a/java/org/apache/coyote/http11/InternalNioInputBuffer.java b/java/org/apache/coyote/http11/InternalNioInputBuffer.java index 4f12954ae..e6c8f4fbb 100644 --- a/java/org/apache/coyote/http11/InternalNioInputBuffer.java +++ b/java/org/apache/coyote/http11/InternalNioInputBuffer.java @@ -101,7 +101,6 @@ public class InternalNioInputBuffer extends AbstractInputBuffer { * Selector pool, for blocking reads and blocking writes */ protected NioSelectorPool pool; - // ------------------------------------------------------------- Properties @@ -495,8 +494,7 @@ public class InternalNioInputBuffer extends AbstractInputBuffer { // Reading the header name // Header name is always US-ASCII // - - + while (headerParsePos == HeaderParsePosition.HEADER_NAME) { @@ -650,8 +648,6 @@ public class InternalNioInputBuffer extends AbstractInputBuffer { } - - // ------------------------------------------------------ Protected Methods /** diff --git a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java index ffa17d2e3..b64a06c79 100644 --- a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java +++ b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java @@ -103,8 +103,6 @@ public class InternalNioOutputBuffer extends AbstractOutputBuffer { protected NioSelectorPool pool; - - // ------------------------------------------------------------- Properties @@ -229,7 +227,6 @@ public class InternalNioOutputBuffer extends AbstractOutputBuffer { } - // ------------------------------------------------------ Protected Methods diff --git a/java/org/apache/coyote/http11/InternalOutputBuffer.java b/java/org/apache/coyote/http11/InternalOutputBuffer.java index 0230e2e12..501d04c52 100644 --- a/java/org/apache/coyote/http11/InternalOutputBuffer.java +++ b/java/org/apache/coyote/http11/InternalOutputBuffer.java @@ -123,8 +123,6 @@ public class InternalOutputBuffer extends AbstractOutputBuffer } } - - // --------------------------------------------------------- Public Methods @@ -149,9 +147,6 @@ public class InternalOutputBuffer extends AbstractOutputBuffer } - - - /** * Recycle the output buffer. This should be called when closing the * connection. @@ -208,7 +203,6 @@ public class InternalOutputBuffer extends AbstractOutputBuffer } - // ------------------------------------------------------ Protected Methods @@ -237,8 +231,6 @@ public class InternalOutputBuffer extends AbstractOutputBuffer } - - /** * Callback to write data from the buffer. */ diff --git a/java/org/apache/jasper/compiler/BeanRepository.java b/java/org/apache/jasper/compiler/BeanRepository.java index 032b978cf..c702c211d 100644 --- a/java/org/apache/jasper/compiler/BeanRepository.java +++ b/java/org/apache/jasper/compiler/BeanRepository.java @@ -71,5 +71,3 @@ public class BeanRepository { } - - diff --git a/java/org/apache/jasper/tagplugins/jstl/core/Import.java b/java/org/apache/jasper/tagplugins/jstl/core/Import.java index aaaae4c36..d92df284c 100644 --- a/java/org/apache/jasper/tagplugins/jstl/core/Import.java +++ b/java/org/apache/jasper/tagplugins/jstl/core/Import.java @@ -376,7 +376,6 @@ public class Import implements TagPlugin { } } } - - - + + } diff --git a/java/org/apache/jasper/xmlparser/XMLChar.java b/java/org/apache/jasper/xmlparser/XMLChar.java index 4e022ec7f..4e84e332b 100644 --- a/java/org/apache/jasper/xmlparser/XMLChar.java +++ b/java/org/apache/jasper/xmlparser/XMLChar.java @@ -967,9 +967,6 @@ public class XMLChar { } // isValidName(String):boolean - - - // encodings /** diff --git a/java/org/apache/juli/logging/LogFactory.java b/java/org/apache/juli/logging/LogFactory.java index c013eb608..63fd87b6d 100644 --- a/java/org/apache/juli/logging/LogFactory.java +++ b/java/org/apache/juli/logging/LogFactory.java @@ -22,7 +22,6 @@ import java.util.Properties; import java.util.logging.LogManager; - /** * Modified LogFactory: removed all discovery, hardcode a specific implementation * If you like a different logging implementation - use either the discovery-based @@ -244,13 +243,9 @@ public /* abstract */ class LogFactory { } - - - // ------------------------------------------------------- Static Variables - // --------------------------------------------------------- Static Methods diff --git a/java/org/apache/tomcat/util/bcel/Constants.java b/java/org/apache/tomcat/util/bcel/Constants.java index 59c5cb34d..cac45f496 100644 --- a/java/org/apache/tomcat/util/bcel/Constants.java +++ b/java/org/apache/tomcat/util/bcel/Constants.java @@ -293,7 +293,6 @@ public interface Constants { "void", "array", "object", "unknown", "address" }; - /** * Number of byte code operands for each opcode, i.e., number of bytes after the tag byte @@ -482,9 +481,6 @@ public interface Constants { ILLEGAL_OPCODE, "impdep1", "impdep2" }; - - - /** Attributes and their corresponding names. */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java b/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java index e5ecfca4a..251a57d26 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java +++ b/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java @@ -80,7 +80,6 @@ public class AnnotationDefault extends Attribute default_value = defaultValue; } - @Override public Attribute copy(ConstantPool _constant_pool) diff --git a/java/org/apache/tomcat/util/bcel/classfile/Attribute.java b/java/org/apache/tomcat/util/bcel/classfile/Attribute.java index 2ce8417a5..d0f781547 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Attribute.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Attribute.java @@ -193,13 +193,6 @@ public abstract class Attribute implements Cloneable, Serializable return c.getBytes(); } - - - - - - - /** * @return Tag of attribute, i.e., its type. Value may not be altered, thus @@ -210,9 +203,6 @@ public abstract class Attribute implements Cloneable, Serializable return tag; } - - - /** * Use copy() if you want to have a deep copy(), i.e., with all references diff --git a/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java b/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java index 489d6a4f1..000879618 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java @@ -35,9 +35,6 @@ public class ClassElementValue extends ElementValue this.idx = idx; } - - - @Override public String stringifyValue() diff --git a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java index 6015ab71d..c601b872f 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java @@ -79,12 +79,6 @@ public final class ClassParser { } - - - - - - /** * Parse the given Java class file and return an object that represents * the contained data, i.e., constants, methods, fields and commands. diff --git a/java/org/apache/tomcat/util/bcel/classfile/Code.java b/java/org/apache/tomcat/util/bcel/classfile/Code.java index a79f0905a..80b7a3135 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Code.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Code.java @@ -55,9 +55,6 @@ public final class Code extends Attribute { private Attribute[] attributes; // or LocalVariable - - - /** * @param name_index Index pointing to the name Code * @param length Content length in bytes @@ -141,12 +138,6 @@ public final class Code extends Attribute { } - - - - - - /** * @return LocalVariableTable of Code, if it has one */ @@ -160,18 +151,6 @@ public final class Code extends Attribute { } - - - - - - - - - - - - /** * @return the internal length of this code attribute (minus the first 6 bytes) * and excluding all its attributes @@ -226,12 +205,6 @@ public final class Code extends Attribute { } - - - - - - /** * @return String representation of code chunk. */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/CodeException.java b/java/org/apache/tomcat/util/bcel/classfile/CodeException.java index 4734dd386..72f7a916d 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/CodeException.java +++ b/java/org/apache/tomcat/util/bcel/classfile/CodeException.java @@ -47,9 +47,6 @@ public final class CodeException implements Cloneable, Constants, Serializable { */ - - - /** * Construct object from file stream. * @param file Input stream @@ -79,9 +76,6 @@ public final class CodeException implements Cloneable, Constants, Serializable { } - - - /** * Dump code exception to file stream in binary format. * @@ -96,30 +90,6 @@ public final class CodeException implements Cloneable, Constants, Serializable { } - - - - - - - - - - - - - - - - - - - - - - - - /** * @return String representation. */ @@ -145,9 +115,6 @@ public final class CodeException implements Cloneable, Constants, Serializable { } - - - /** * @return deep copy of this object */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/Constant.java b/java/org/apache/tomcat/util/bcel/classfile/Constant.java index 2fca08a7f..507a67d85 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Constant.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Constant.java @@ -89,9 +89,6 @@ public abstract class Constant implements Cloneable, Serializable { } - - - @Override public Object clone() throws CloneNotSupportedException { return super.clone(); @@ -136,12 +133,6 @@ public abstract class Constant implements Cloneable, Serializable { } - - - - - - /** * Return value as defined by given BCELComparator strategy. * By default two Constant objects are said to be equal when diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java index e47ffd294..f0221e86a 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java @@ -38,9 +38,6 @@ public abstract class ConstantCP extends Constant { protected int class_index, name_and_type_index; - - - /** * Initialize instance from file data. * @@ -94,15 +91,6 @@ public abstract class ConstantCP extends Constant { } - - - - - - - - - /** * @return String representation. */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java index d387355ad..43dff5cea 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java @@ -38,9 +38,6 @@ public final class ConstantClass extends Constant implements ConstantObject { private int name_index; // Identical to ConstantString except for the name - - - /** * Initialize instance from file data. * @@ -83,15 +80,6 @@ public final class ConstantClass extends Constant implements ConstantObject { } - - - - - - - - - /** * @return String representation. */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java index 38495953e..e61de2c63 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java @@ -47,9 +47,6 @@ public final class ConstantDouble extends Constant implements ConstantObject { } - - - /** * Initialize instance from file data. * @@ -82,9 +79,6 @@ public final class ConstantDouble extends Constant implements ConstantObject { } - - - /** * @return String representation. */ @@ -94,5 +88,4 @@ public final class ConstantDouble extends Constant implements ConstantObject { } - } diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java index 3b2ff84a6..58e03deae 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java @@ -30,8 +30,6 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class ConstantFieldref extends ConstantCP { - - private static final long serialVersionUID = -8062332095934294437L; @@ -46,5 +44,4 @@ public final class ConstantFieldref extends ConstantCP { } - } diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java index f72b408d4..23650af54 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java @@ -47,9 +47,6 @@ public final class ConstantFloat extends Constant implements ConstantObject { } - - - /** * Initialize instance from file data. * @@ -82,9 +79,6 @@ public final class ConstantFloat extends Constant implements ConstantObject { } - - - /** * @return String representation. */ @@ -94,5 +88,4 @@ public final class ConstantFloat extends Constant implements ConstantObject { } - } diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java index 64da22644..64a403e9e 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java @@ -47,9 +47,6 @@ public final class ConstantInteger extends Constant implements ConstantObject { } - - - /** * Initialize instance from file data. * @@ -82,9 +79,6 @@ public final class ConstantInteger extends Constant implements ConstantObject { } - - - /** * @return String representation. */ @@ -94,5 +88,4 @@ public final class ConstantInteger extends Constant implements ConstantObject { } - } diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java index b4f3502c6..b9acf71a6 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java @@ -30,8 +30,6 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class ConstantInterfaceMethodref extends ConstantCP { - - private static final long serialVersionUID = -8587605570227841891L; @@ -46,5 +44,4 @@ public final class ConstantInterfaceMethodref extends ConstantCP { } - } diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java index c9d67105f..1161852d6 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java @@ -47,9 +47,6 @@ public final class ConstantLong extends Constant implements ConstantObject { } - - - /** * Initialize instance from file data. * @@ -82,9 +79,6 @@ public final class ConstantLong extends Constant implements ConstantObject { } - - - /** * @return String representation. */ @@ -94,5 +88,4 @@ public final class ConstantLong extends Constant implements ConstantObject { } - } diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java index b99139e3c..58419ac97 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java @@ -30,8 +30,6 @@ import org.apache.tomcat.util.bcel.Constants; */ public final class ConstantMethodref extends ConstantCP { - - private static final long serialVersionUID = -7857009620954576086L; @@ -46,5 +44,4 @@ public final class ConstantMethodref extends ConstantCP { } - } diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java index 0a38d6ef8..cdc75e19a 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java @@ -40,9 +40,6 @@ public final class ConstantNameAndType extends Constant { private int signature_index; // and its signature. - - - /** * Initialize instance from file data. * @@ -87,9 +84,6 @@ public final class ConstantNameAndType extends Constant { } - - - /** * @return Index in constant pool of field/method signature. */ @@ -98,15 +92,6 @@ public final class ConstantNameAndType extends Constant { } - - - - - - - - - /** * @return String representation */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java index 81d08aa55..673b299b5 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java @@ -42,9 +42,6 @@ public class ConstantPool implements Cloneable, Serializable { private Constant[] constant_pool; - - - /** * Read constants from given file stream. * @@ -76,9 +73,6 @@ public class ConstantPool implements Cloneable, Serializable { } - - - /** * Resolve constant to a string representation. * @@ -178,9 +172,6 @@ public class ConstantPool implements Cloneable, Serializable { } - - - /** * Get constant from constant pool. * @@ -221,9 +212,6 @@ public class ConstantPool implements Cloneable, Serializable { } - - - /** * Get string from constant pool and bypass the indirection of * `ConstantClass' and `ConstantString' objects. I.e. these classes have @@ -285,5 +273,4 @@ public class ConstantPool implements Cloneable, Serializable { } - } diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java index 14cc108ab..2b861fa91 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java @@ -38,9 +38,6 @@ public final class ConstantString extends Constant implements ConstantObject { private int string_index; // Identical to ConstantClass except for this name - - - /** * Initialize instance from file data. * @@ -82,9 +79,6 @@ public final class ConstantString extends Constant implements ConstantObject { } - - - /** * @return String representation. */ @@ -94,8 +88,4 @@ public final class ConstantString extends Constant implements ConstantObject { } - - - - } diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java index 21ed5be25..562420201 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java @@ -38,9 +38,6 @@ public final class ConstantUtf8 extends Constant { private String bytes; - - - /** * Initialize instance from file data. * @@ -53,9 +50,6 @@ public final class ConstantUtf8 extends Constant { } - - - /** * Dump String in Utf8 format to file stream. * @@ -77,9 +71,6 @@ public final class ConstantUtf8 extends Constant { } - - - /** * @return String representation */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java b/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java index 627bb8d7f..b77b4aaa3 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java @@ -38,9 +38,6 @@ public final class ConstantValue extends Attribute { private int constantvalue_index; - - - /** * Construct object from file stream. * @param name_index Name index in constant pool @@ -81,12 +78,6 @@ public final class ConstantValue extends Attribute { } - - - - - - /** * @return String representation of constant value. */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java b/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java index 99795e469..2f49de736 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java @@ -38,9 +38,6 @@ public final class Deprecated extends Attribute { private byte[] bytes; - - - /** * @param name_index Index in constant pool to CONSTANT_Utf8 * @param length Content length in bytes @@ -87,12 +84,6 @@ public final class Deprecated extends Attribute { } - - - - - - /** * @return attribute name */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java b/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java index c21de1453..cdd4d7ec9 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java @@ -44,7 +44,6 @@ public abstract class ElementValue this.cpool = cpool; } - public abstract String stringifyValue(); diff --git a/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java b/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java index 2691e977a..e576ff408 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java @@ -42,9 +42,6 @@ public final class ExceptionTable extends Attribute { private int[] exception_index_table; // constant pool - - - /** * @param name_index Index in constant pool * @param length Content length in bytes @@ -93,15 +90,6 @@ public final class ExceptionTable extends Attribute { } - - - - - - - - - /** * @param exception_index_table the list of exception indexes * Also redefines number_of_exceptions according to table length. diff --git a/java/org/apache/tomcat/util/bcel/classfile/Field.java b/java/org/apache/tomcat/util/bcel/classfile/Field.java index 0bb58e079..2d99eda36 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Field.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Field.java @@ -52,9 +52,6 @@ public final class Field extends FieldOrMethod { }; - - - /** * Construct object from file stream. * @param file Input stream @@ -65,12 +62,6 @@ public final class Field extends FieldOrMethod { } - - - - - - /** * @return constant value associated with this field (may be null) */ @@ -114,18 +105,6 @@ public final class Field extends FieldOrMethod { } - - - - - - - - - - - - /** * Return value as defined by given BCELComparator strategy. * By default two Field objects are said to be equal when diff --git a/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java b/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java index bd0b390fe..1c2f4ca7b 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java +++ b/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java @@ -42,9 +42,6 @@ public final class InnerClass implements Cloneable, Serializable { private int inner_access_flags; - - - /** * Construct object from file stream. * @param file Input stream @@ -71,9 +68,6 @@ public final class InnerClass implements Cloneable, Serializable { } - - - /** * Dump inner class attribute to file stream in binary format. * @@ -88,30 +82,6 @@ public final class InnerClass implements Cloneable, Serializable { } - - - - - - - - - - - - - - - - - - - - - - - - /** * @return String representation. */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java b/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java index d87c50593..01febbd68 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java +++ b/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java @@ -40,9 +40,6 @@ public final class InnerClasses extends Attribute { private int number_of_classes; - - - /** * @param name_index Index in constant pool to CONSTANT_Utf8 * @param length Content length in bytes @@ -92,9 +89,6 @@ public final class InnerClasses extends Attribute { } - - - /** * @param inner_classes the array of inner classes */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java index 1529623f4..fd354ff5d 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java +++ b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java @@ -50,12 +50,8 @@ public class JavaClass extends AccessFlags implements Cloneable, Comparable { private Method[] methods; // methods defined in the class private Attribute[] attributes; // attributes defined in the class private AnnotationEntry[] annotations; // annotations defined on the class - - - - - - + + // Annotations are collected from certain attributes, don't do it more than necessary! private boolean annotationsOutOfDate = true; @@ -148,30 +144,6 @@ public class JavaClass extends AccessFlags implements Cloneable, Comparable { } - - - - - - - - - - - - - - - - - - - - - - - - /** * @return Attributes of the class. */ @@ -272,9 +244,6 @@ public class JavaClass extends AccessFlags implements Cloneable, Comparable { } - - - public final boolean isSuper() { return (access_flags & Constants.ACC_SUPER) != 0; } diff --git a/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java b/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java index 385197190..dd1efab41 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java +++ b/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java @@ -38,9 +38,6 @@ public final class LineNumber implements Cloneable, Serializable { private int line_number; // number in source file - - - /** * Construct object from file stream. * @param file Input stream @@ -61,9 +58,6 @@ public final class LineNumber implements Cloneable, Serializable { } - - - /** * Dump line number/pc pair to file stream in binary format. * @@ -76,18 +70,6 @@ public final class LineNumber implements Cloneable, Serializable { } - - - - - - - - - - - - /** * @return String representation */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java b/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java index 69996d746..d512eaa36 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java +++ b/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java @@ -40,9 +40,6 @@ public final class LineNumberTable extends Attribute { private LineNumber[] line_number_table; // Table of line/numbers pairs - - - /* * @param name_index Index of name * @param length Content length in bytes @@ -91,9 +88,6 @@ public final class LineNumberTable extends Attribute { } - - - /** * @param line_number_table the line number entries for this table */ @@ -127,9 +121,6 @@ public final class LineNumberTable extends Attribute { } - - - /** * @return deep copy of this attribute */ @@ -145,5 +136,4 @@ public final class LineNumberTable extends Attribute { } - } diff --git a/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java b/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java index 0f932c36e..24cf4bce8 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java +++ b/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java @@ -45,9 +45,6 @@ public final class LocalVariable implements Constants, Cloneable, Serializable { private ConstantPool constant_pool; - - - /** * Construct object from file stream. * @param file Input stream @@ -78,9 +75,6 @@ public final class LocalVariable implements Constants, Cloneable, Serializable { } - - - /** * Dump local variable to file stream in binary format. * @@ -96,12 +90,6 @@ public final class LocalVariable implements Constants, Cloneable, Serializable { } - - - - - - /** * @return Variable name. */ @@ -112,9 +100,6 @@ public final class LocalVariable implements Constants, Cloneable, Serializable { } - - - /** * @return Signature. */ @@ -125,9 +110,6 @@ public final class LocalVariable implements Constants, Cloneable, Serializable { } - - - /** * @return index of register where variable is stored */ @@ -136,27 +118,6 @@ public final class LocalVariable implements Constants, Cloneable, Serializable { } - - - - - - - - - - - - - - - - - - - - - /** * @return string representation. */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java b/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java index cd363f6a4..30065b01f 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java +++ b/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java @@ -39,9 +39,6 @@ public class LocalVariableTable extends Attribute { private LocalVariable[] local_variable_table; // variables - - - /** * @param name_index Index in constant pool to `LocalVariableTable' * @param length Content length in bytes @@ -90,9 +87,6 @@ public class LocalVariableTable extends Attribute { } - - - /** * * @param index the variable slot @@ -150,5 +144,4 @@ public class LocalVariableTable extends Attribute { } - } diff --git a/java/org/apache/tomcat/util/bcel/classfile/Method.java b/java/org/apache/tomcat/util/bcel/classfile/Method.java index 0ee94348a..2b1b8915d 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Method.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Method.java @@ -61,9 +61,6 @@ public final class Method extends FieldOrMethod { } - - - /** * Construct object from file stream. * @param file Input stream @@ -76,12 +73,6 @@ public final class Method extends FieldOrMethod { } - - - - - - /** * @return Code attribute of method, if any */ @@ -121,9 +112,6 @@ public final class Method extends FieldOrMethod { } - - - /** * Return string representation close to declaration format, * `public static void main(String[] args) throws IOException', e.g. @@ -161,21 +149,6 @@ public final class Method extends FieldOrMethod { } - - - - - - - - - - - - - - - /** * Return value as defined by given BCELComparator strategy. * By default two method objects are said to be equal when diff --git a/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java b/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java index 18310c717..5a1c12899 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java +++ b/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java @@ -37,9 +37,6 @@ public final class PMGClass extends Attribute { private int pmg_class_index, pmg_index; - - - /** * Construct object from file stream. * @param name_index Index in constant pool to CONSTANT_Utf8 @@ -83,18 +80,6 @@ public final class PMGClass extends Attribute { } - - - - - - - - - - - - /** * @return PMG name. */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/Signature.java b/java/org/apache/tomcat/util/bcel/classfile/Signature.java index 3e474c66f..63a247091 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Signature.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Signature.java @@ -37,9 +37,6 @@ public final class Signature extends Attribute { private int signature_index; - - - /** * Construct object from file stream. * @param name_index Index in constant pool to CONSTANT_Utf8 @@ -79,12 +76,6 @@ public final class Signature extends Attribute { } - - - - - - /** * @return GJ signature. */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java b/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java index 9fbb72d27..4a98eea10 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java +++ b/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java @@ -39,9 +39,6 @@ public final class SourceFile extends Attribute { private int sourcefile_index; - - - /** * Construct object from file stream. * @param name_index Index in constant pool to CONSTANT_Utf8 @@ -88,12 +85,6 @@ public final class SourceFile extends Attribute { } - - - - - - /** * @return Source file name. */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/StackMap.java b/java/org/apache/tomcat/util/bcel/classfile/StackMap.java index 411e63401..37fd94fb6 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/StackMap.java +++ b/java/org/apache/tomcat/util/bcel/classfile/StackMap.java @@ -92,9 +92,6 @@ public final class StackMap extends Attribute { } - - - /** * @param map Array of stack map entries */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java b/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java index 25da5e7d1..235746a1d 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java +++ b/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java @@ -121,36 +121,6 @@ public final class StackMapEntry implements Cloneable { } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /** * @return deep copy of this object */ @@ -163,11 +133,4 @@ public final class StackMapEntry implements Cloneable { } - - - - - - - } diff --git a/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java b/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java index c717877ae..ccf001284 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java +++ b/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java @@ -92,9 +92,6 @@ public final class StackMapTable extends Attribute { } - - - /** * @param map Array of stack map entries */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java b/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java index bb4c85a99..8bc94fb48 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java +++ b/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java @@ -196,36 +196,6 @@ public final class StackMapTableEntry implements Cloneable { } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /** * @return deep copy of this object */ @@ -238,11 +208,4 @@ public final class StackMapTableEntry implements Cloneable { } - - - - - - - } diff --git a/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java b/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java index c19b0473a..0b37f95f0 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java +++ b/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java @@ -73,9 +73,6 @@ public final class StackMapType implements Cloneable { } - - - public void setIndex( int t ) { index = t; } @@ -133,12 +130,6 @@ public final class StackMapType implements Cloneable { } - - - - - - /** * @param constant_pool Constant pool to be used for this object. */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java b/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java index 50d6d1b5e..226aedc67 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java @@ -42,9 +42,6 @@ public final class Synthetic extends Attribute { private byte[] bytes; - - - /** * @param name_index Index in constant pool to CONSTANT_Utf8, which * should represent the string "Synthetic". @@ -93,12 +90,6 @@ public final class Synthetic extends Attribute { } - - - - - - /** * @return String representation. */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/Unknown.java b/java/org/apache/tomcat/util/bcel/classfile/Unknown.java index b498b2856..a1aea565a 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Unknown.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Unknown.java @@ -49,12 +49,6 @@ public final class Unknown extends Attribute { private static final Map unknown_attributes = new HashMap(); - - - - - - /** * Create a non-standard attribute. * @@ -105,9 +99,6 @@ public final class Unknown extends Attribute { } - - - /** * @return name of attribute. */ @@ -117,9 +108,6 @@ public final class Unknown extends Attribute { } - - - /** * @return String representation. */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/Utility.java b/java/org/apache/tomcat/util/bcel/classfile/Utility.java index 01dbbdd8d..7aae6b2ae 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/Utility.java +++ b/java/org/apache/tomcat/util/bcel/classfile/Utility.java @@ -153,9 +153,6 @@ public abstract class Utility { } - - - /** * Disassemble a stream of byte codes and return the * string representation. @@ -411,9 +408,6 @@ public abstract class Utility { } - - - /** * Shorten long class names, java/lang/String becomes * String. @@ -786,9 +780,4 @@ public abstract class Utility { } - - - - - } diff --git a/java/org/apache/tomcat/util/bcel/util/ByteSequence.java b/java/org/apache/tomcat/util/bcel/util/ByteSequence.java index 17037f643..ca94b6e23 100644 --- a/java/org/apache/tomcat/util/bcel/util/ByteSequence.java +++ b/java/org/apache/tomcat/util/bcel/util/ByteSequence.java @@ -44,8 +44,6 @@ public final class ByteSequence extends DataInputStream { } - - private static final class ByteArrayStream extends ByteArrayInputStream { ByteArrayStream(byte[] bytes) { diff --git a/java/org/apache/tomcat/util/buf/MessageBytes.java b/java/org/apache/tomcat/util/buf/MessageBytes.java index 90fca3c25..ae9d801c1 100644 --- a/java/org/apache/tomcat/util/buf/MessageBytes.java +++ b/java/org/apache/tomcat/util/buf/MessageBytes.java @@ -399,7 +399,6 @@ public final class MessageBytes implements Cloneable, Serializable { } } - // -------------------- Hash code -------------------- @Override diff --git a/java/org/apache/tomcat/util/digester/Digester.java b/java/org/apache/tomcat/util/digester/Digester.java index e96f06bc2..aae5e2708 100644 --- a/java/org/apache/tomcat/util/digester/Digester.java +++ b/java/org/apache/tomcat/util/digester/Digester.java @@ -52,8 +52,6 @@ import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.DefaultHandler; - - /** *

A Digester processes an XML input stream by matching a * series of element nesting patterns to execute Rules that have been added @@ -314,7 +312,6 @@ public class Digester extends DefaultHandler { protected boolean validating = false; - /** * Warn on missing attributes and elements. */ diff --git a/java/org/apache/tomcat/util/http/CookieSupport.java b/java/org/apache/tomcat/util/http/CookieSupport.java index 53906073d..e03043c67 100644 --- a/java/org/apache/tomcat/util/http/CookieSupport.java +++ b/java/org/apache/tomcat/util/http/CookieSupport.java @@ -211,9 +211,8 @@ public final class CookieSupport { if (value==null || value.length() < 2) return false; return (value.charAt(0)=='\"' && value.charAt(value.length()-1)=='\"'); } - - + // ------------------------------------------------------------- Constructor private CookieSupport() { // Utility class. Don't allow instances to be created. diff --git a/java/org/apache/tomcat/util/http/MimeHeaders.java b/java/org/apache/tomcat/util/http/MimeHeaders.java index d354e254d..a323d5b88 100644 --- a/java/org/apache/tomcat/util/http/MimeHeaders.java +++ b/java/org/apache/tomcat/util/http/MimeHeaders.java @@ -64,7 +64,6 @@ import org.apache.tomcat.util.buf.MessageBytes; ( addHeader hook ) */ - /** diff --git a/java/org/apache/tomcat/util/http/fileupload/FileUtils.java b/java/org/apache/tomcat/util/http/fileupload/FileUtils.java index e8af88597..460942190 100644 --- a/java/org/apache/tomcat/util/http/fileupload/FileUtils.java +++ b/java/org/apache/tomcat/util/http/fileupload/FileUtils.java @@ -85,7 +85,6 @@ public class FileUtils { } } - /** * Cleans a directory without deleting it. diff --git a/java/org/apache/tomcat/util/http/fileupload/IOUtils.java b/java/org/apache/tomcat/util/http/fileupload/IOUtils.java index 103dfd47b..efdd0fdc1 100644 --- a/java/org/apache/tomcat/util/http/fileupload/IOUtils.java +++ b/java/org/apache/tomcat/util/http/fileupload/IOUtils.java @@ -155,8 +155,4 @@ public class IOUtils { } - - - - } diff --git a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java index 35a3f9bee..390bb6e8f 100644 --- a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java +++ b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java @@ -658,8 +658,6 @@ public class DiskFileItem } - - /** * Returns a string representation of this object. * diff --git a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java index 8cf3677f0..c5438bebd 100644 --- a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java +++ b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java @@ -713,8 +713,6 @@ public class BaseModelMBean implements DynamicMBean, MBeanRegistration, ModelMBe } - - /** * Send a Notification to all registered listeners as a * jmx.modelmbean.general notification. @@ -765,8 +763,6 @@ public class BaseModelMBean implements DynamicMBean, MBeanRegistration, ModelMBe } - - // ---------------------------------------- NotificationBroadcaster Methods diff --git a/java/org/apache/tomcat/util/modeler/Registry.java b/java/org/apache/tomcat/util/modeler/Registry.java index 2ac06d208..1b1c106fe 100644 --- a/java/org/apache/tomcat/util/modeler/Registry.java +++ b/java/org/apache/tomcat/util/modeler/Registry.java @@ -874,9 +874,7 @@ public class Registry implements RegistryMBean, MBeanRegistration { public void postDeregister() { } - - - + // -------------------- DEPRECATED METHODS -------------------- // May still be used in tomcat // Never part of an official release diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java b/java/org/apache/tomcat/util/net/AbstractEndpoint.java index 8c89c1551..63b31066f 100644 --- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java +++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java @@ -306,7 +306,6 @@ public abstract class AbstractEndpoint { public int getThreadPriority() { return threadPriority; } - /** * Generic properties, introspected */ @@ -572,8 +571,7 @@ public abstract class AbstractEndpoint { allowUnsafeLegacyRenegotiation = s; } - - + private String sslEnabledProtocols=null; //"TLSv1,SSLv3,SSLv2Hello" private String[] sslEnabledProtocolsarr = new String[0]; public String[] getSslEnabledProtocolsArray() { return this.sslEnabledProtocolsarr;} diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index 58acbd931..5508e5db9 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -747,7 +747,6 @@ public class AprEndpoint extends AbstractEndpoint { // ------------------------------------------------------ Protected Methods - /** * Process the specified connection. */ @@ -791,7 +790,6 @@ public class AprEndpoint extends AbstractEndpoint { } - /** * Allocate a new poller of the specified size. */ @@ -1205,8 +1203,6 @@ public class AprEndpoint extends AbstractEndpoint { // ----------------------------------------------------- Worker Inner Class - - // ----------------------------------------------- SendfileData Inner Class @@ -1546,7 +1542,6 @@ public class AprEndpoint extends AbstractEndpoint { } - // ---------------------------------------------- SocketProcessor Inner Class diff --git a/java/org/apache/tomcat/util/net/JIoEndpoint.java b/java/org/apache/tomcat/util/net/JIoEndpoint.java index f393c5d76..f40694728 100644 --- a/java/org/apache/tomcat/util/net/JIoEndpoint.java +++ b/java/org/apache/tomcat/util/net/JIoEndpoint.java @@ -107,9 +107,6 @@ public class JIoEndpoint extends AbstractEndpoint { public ServerSocketFactory getServerSocketFactory() { return serverSocketFactory; } - - - // ------------------------------------------------ Handler Inner Interface @@ -289,8 +286,7 @@ public class JIoEndpoint extends AbstractEndpoint { } } - - + // -------------------- Public methods -------------------- @@ -453,8 +449,6 @@ public class JIoEndpoint extends AbstractEndpoint { initialized = false ; } - - /** * Set the options for the current socket. diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java index c9faf3e7d..bb4b47c66 100644 --- a/java/org/apache/tomcat/util/net/NioEndpoint.java +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java @@ -280,7 +280,6 @@ public class NioEndpoint extends AbstractEndpoint { } }; - // ------------------------------------------------------------- Properties @@ -304,7 +303,6 @@ public class NioEndpoint extends AbstractEndpoint { } - /** * Priority of the acceptor threads. */ @@ -320,7 +318,6 @@ public class NioEndpoint extends AbstractEndpoint { public int getPollerThreadPriority() { return pollerThreadPriority; } - /** * Handling of accepted sockets. */ @@ -329,10 +326,6 @@ public class NioEndpoint extends AbstractEndpoint { public Handler getHandler() { return handler; } - - - - /** * Allow comet request handling. */ @@ -349,7 +342,6 @@ public class NioEndpoint extends AbstractEndpoint { public int getAcceptorThreadCount() { return acceptorThreadCount; } - /** * Poller thread count. */ @@ -374,8 +366,6 @@ public class NioEndpoint extends AbstractEndpoint { } - - public void setSelectorPool(NioSelectorPool selectorPool) { this.selectorPool = selectorPool; } @@ -447,8 +437,6 @@ public class NioEndpoint extends AbstractEndpoint { } - - /** * Return the state of the endpoint. * @@ -706,9 +694,6 @@ public class NioEndpoint extends AbstractEndpoint { } - - - /** * Process the specified connection. */ @@ -1502,7 +1487,6 @@ public class NioEndpoint extends AbstractEndpoint { } - // ---------------------------------------------- SocketProcessor Inner Class /** * This class is the equivalent of the Worker, but will simply use in an diff --git a/java/org/apache/tomcat/util/net/SocketProperties.java b/java/org/apache/tomcat/util/net/SocketProperties.java index 826248d34..66a210132 100644 --- a/java/org/apache/tomcat/util/net/SocketProperties.java +++ b/java/org/apache/tomcat/util/net/SocketProperties.java @@ -419,7 +419,6 @@ public class SocketProperties { public void setUnlockTimeout(int unlockTimeout) { this.unlockTimeout = unlockTimeout; } - - + } diff --git a/java/org/apache/tomcat/util/net/URL.java b/java/org/apache/tomcat/util/net/URL.java index a0f996677..1ed45ebe3 100644 --- a/java/org/apache/tomcat/util/net/URL.java +++ b/java/org/apache/tomcat/util/net/URL.java @@ -174,9 +174,6 @@ public final class URL implements Serializable { } - - - /** * Create a URL object from the specified components. The default port * number for the specified protocol will be used. diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java index 0f0eab7c8..271b3fb98 100644 --- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java +++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java @@ -115,6 +115,5 @@ public class ThreadPoolExecutor extends java.util.concurrent.ThreadPoolExecutor } - - + } diff --git a/modules/bayeux/webapps/cometd/examples/simplechat/ticker.html b/modules/bayeux/webapps/cometd/examples/simplechat/ticker.html index 5e26e4b1b..501beddae 100644 --- a/modules/bayeux/webapps/cometd/examples/simplechat/ticker.html +++ b/modules/bayeux/webapps/cometd/examples/simplechat/ticker.html @@ -45,8 +45,6 @@ dojo.addOnUnload(function() { }); - - function subscribe(box, symbol) { if (box.checked) { dojox.cometd.subscribe("/stock/"+symbol, onMsgEvent); diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java index 17f831cf3..c7966fe1e 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java @@ -57,7 +57,6 @@ public class DataSourceProxy implements PoolConfiguration { if (poolProperties == null) throw new NullPointerException("PoolConfiguration can not be null."); this.poolProperties = poolProperties; } - public boolean isWrapperFor(Class iface) throws SQLException { @@ -193,8 +192,6 @@ public class DataSourceProxy implements PoolConfiguration { } - - /*-----------------------------------------------------------------------*/ // PROPERTIES WHEN NOT USED WITH FACTORY /*------------------------------------------------------------------------*/ diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java index ba1eab062..e70044ccb 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java @@ -798,9 +798,8 @@ public class PoolProperties implements PoolConfiguration { result = result || (timer && getMinEvictableIdleTimeMillis()>0); return result; } - - - + + public static class InterceptorDefinition { protected String className; protected Map properties = new HashMap(); diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java index dad20d91a..786ad911c 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java @@ -457,9 +457,7 @@ public class PooledConnection { this.timestamp = timestamp; setSuspect(false); } - - - + public boolean isSuspect() { return suspect; diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimer.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimer.java index 9e5ec0a08..328d6be83 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimer.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimer.java @@ -55,8 +55,7 @@ public class ResetAbandonedTimer extends AbstractQueryReport { } return result; } - - + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java index 488c6a9a3..274d8562a 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java @@ -74,9 +74,8 @@ public class SlowQueryReport extends AbstractQueryReport { public void setMaxQueries(int maxQueries) { this.maxQueries = maxQueries; } - - - + + @Override protected String reportFailedQuery(String query, Object[] args, String name, long start, Throwable t) { String sql = super.reportFailedQuery(query, args, name, start, t); @@ -181,9 +180,7 @@ public class SlowQueryReport extends AbstractQueryReport { if (log.isDebugEnabled()) log.debug("Removing slow query, capacity reached:"+sql); } } - - - + @Override public void reset(ConnectionPool parent, PooledConnection con) { @@ -192,9 +189,6 @@ public class SlowQueryReport extends AbstractQueryReport { queries = SlowQueryReport.perPoolStats.get(parent.getName()); } - - - @Override public void setProperties(Map properties) { @@ -212,9 +206,6 @@ public class SlowQueryReport extends AbstractQueryReport { } - - - /** * * @author fhanik diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java index a65ca7525..433519c90 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java @@ -89,8 +89,7 @@ public class SlowQueryReportJmx extends SlowQueryReport implements NotificationE } - - + //==============================JMX STUFF======================== protected String poolName = null; @@ -129,7 +128,6 @@ public class SlowQueryReportJmx extends SlowQueryReport implements NotificationE } - @Override public void poolClosed(ConnectionPool pool) { this.poolName = pool.getName(); @@ -201,9 +199,8 @@ public class SlowQueryReportJmx extends SlowQueryReport implements NotificationE public String getPoolName() { return poolName; } - - - + + public boolean isNotifyPool() { return notifyPool; } diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java index c32ae16c4..27370d0f7 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java @@ -156,8 +156,7 @@ public class StatementCache extends StatementDecoratorInterceptor { } } - - + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { boolean process = process(this.types, method, false); if (process && args.length>0 && args[0] instanceof String) { diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java index b5bd4117d..b10878dd9 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java @@ -74,10 +74,8 @@ public class ConnectionPool extends NotificationBroadcasterSupport implements Co public static final String SLOW_QUERY_NOTIFICATION = "SLOW QUERY"; public static final String FAILED_QUERY_NOTIFICATION = "FAILED QUERY"; public static final String SUSPECT_ABANDONED_NOTIFICATION = "SUSPECT CONNETION ABANDONED"; - - - - + + public MBeanNotificationInfo[] getNotificationInfo() { MBeanNotificationInfo[] pres = super.getNotificationInfo(); MBeanNotificationInfo[] loc = getDefaultNotificationInfo(); @@ -179,9 +177,8 @@ public class ConnectionPool extends NotificationBroadcasterSupport implements Co //========================================================= // PROPERTIES / CONFIGURATION //========================================================= - - - + + public String getConnectionProperties() { return getPoolProperties().getConnectionProperties(); } diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptor.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptor.java index 91f0407b7..739347c8c 100644 --- a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptor.java +++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptor.java @@ -54,7 +54,6 @@ public class TestInterceptor extends JdbcInterceptor { instancecount.incrementAndGet(); super.setProperties(properties); } - - - + + } diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java index 979f6e979..12441409b 100644 --- a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java +++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java @@ -65,8 +65,6 @@ public class BorrowWaitTest extends DefaultTestCase { } con.close(); } - - - - + + } diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java index 98273954e..339e1aa49 100644 --- a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java +++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java @@ -42,9 +42,8 @@ public class ConnectCountTest extends DefaultTestCase { protected long complete = Long.getLong("complete",20000); protected boolean printthread = Boolean.getBoolean("printthread"); CountDownLatch latch = null; - - - + + @Override public org.apache.tomcat.jdbc.pool.DataSource createDefaultDataSource() { // TODO Auto-generated method stub @@ -57,8 +56,7 @@ public class ConnectCountTest extends DefaultTestCase { ds.getPoolProperties().setMaxActive(10); return ds; } - - + @Override protected void tearDown() throws Exception { @@ -67,7 +65,6 @@ public class ConnectCountTest extends DefaultTestCase { } - protected void printThreadResults(TestThread[] threads, String name, int active, int expected) { long minfetch = Long.MAX_VALUE, maxfetch = Long.MIN_VALUE, totalfetch = 0; long maxwait = 0, minwait = Long.MAX_VALUE, averagewait = 0, totalwait = 0; diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConnectionState.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConnectionState.java index f7ed28dc5..8ed9bb2bd 100644 --- a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConnectionState.java +++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConnectionState.java @@ -77,8 +77,6 @@ public class TestConnectionState extends DefaultTestCase { c1 = d1.getConnection(); assertEquals("Catalog should be information_schema",c1.getCatalog(),"information_schema"); } - - } diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java index c583dee01..1641bb8b5 100644 --- a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java +++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java @@ -38,7 +38,6 @@ public class TestInterceptorShortName extends DefaultTestCase { this.datasource.close(); assertTrue("Pool should have been closed.",TestInterceptor.poolclosed); } - - + } diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestStatementCache.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestStatementCache.java index e683caddb..d3d57400f 100644 --- a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestStatementCache.java +++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestStatementCache.java @@ -39,8 +39,6 @@ public class TestStatementCache extends DefaultTestCase { } - - private void config(boolean cachePrepared, boolean cacheCallable, int max) { datasource.getPoolProperties().setJdbcInterceptors(TestStatementCacheInterceptor.class.getName()+ "(prepared="+cachePrepared+",callable="+cacheCallable+",max="+max+")"); diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TwoDataSources.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TwoDataSources.java index b88f69eb5..2a500e7ae 100644 --- a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TwoDataSources.java +++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TwoDataSources.java @@ -58,9 +58,8 @@ public class TwoDataSources extends DefaultTestCase { }catch (Exception x) { assertTrue("Connection c2 should be working",false); } - - + } } diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/http/BaseMapper.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/http/BaseMapper.java index 1d5eff868..129b4dceb 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/http/BaseMapper.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/http/BaseMapper.java @@ -85,7 +85,6 @@ public class BaseMapper { addWrapper(contextMapElement, path, wrapper, jspWildCard); } - /** * Remove a wrapper from the context associated with this wrapper. diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/http/Http11Connection.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/http/Http11Connection.java index c0d018b8c..4b26ee952 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/http/Http11Connection.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/http/Http11Connection.java @@ -464,7 +464,6 @@ public class Http11Connection extends HttpConnection } } - /** * Updates chunked, contentLength, remaining - based @@ -1078,9 +1077,8 @@ public class Http11Connection extends HttpConnection } } } - - - + + private void flushToNext(IOBuffer body, IOBuffer out) throws IOException { synchronized (this) { diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpChannel.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpChannel.java index bb879d5d8..07ed719a2 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpChannel.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpChannel.java @@ -309,9 +309,8 @@ public class HttpChannel extends IOChannel { public String getStatus() { return getResponse().getStatus() + " " + getResponse().getMessage(); } - - - + + public String getTarget() { if (target == null) { return ":0"; // server mode ? @@ -488,7 +487,6 @@ public class HttpChannel extends IOChannel { } - /* The field-content does not include any leading or trailing LWS: linear white space occurring before the first non-whitespace diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpConnectionPool.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpConnectionPool.java index 696a47089..447935475 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpConnectionPool.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpConnectionPool.java @@ -267,9 +267,7 @@ public class HttpConnectionPool { con = hcon; } } - - - + // we got a connection - make sure we're connected http11ConnectOrSend(httpCh, target, con, ssl); diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpMessage.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpMessage.java index b08d919fd..cfeac7e0b 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpMessage.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpMessage.java @@ -337,8 +337,7 @@ public abstract class HttpMessage { throws UnsupportedEncodingException { this.charEncoding = enc; } - - + public void recycle() { commited = false; diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpRequest.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpRequest.java index a6f86e6fc..3ec8477b0 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpRequest.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpRequest.java @@ -139,9 +139,8 @@ public class HttpRequest extends HttpMessage { public Map attributes() { return attributes; } - - - + + public CBuffer method() { return methodMB; } diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/http/SpdyConnection.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/http/SpdyConnection.java index b692d243d..770ca2ec3 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/http/SpdyConnection.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/http/SpdyConnection.java @@ -155,7 +155,6 @@ public class SpdyConnection extends HttpConnector.HttpConnection } - /** * Frame received. Must consume all data for the frame. * diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/BufferedIOReader.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/BufferedIOReader.java index 6f7dd0d93..a0a00aedd 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/BufferedIOReader.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/BufferedIOReader.java @@ -376,6 +376,5 @@ public class BufferedIOReader extends BufferedReader { } }; - } diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/CBucket.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/CBucket.java index e28d16a6a..aed8d971b 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/CBucket.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/CBucket.java @@ -141,8 +141,6 @@ public class CBucket implements CharSequence, Comparable, Serializable { } - - /** * Compares the message bytes to the specified String object. * diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/CBuffer.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/CBuffer.java index bfe9404df..c66f85644 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/CBuffer.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/CBuffer.java @@ -210,7 +210,6 @@ public class CBuffer extends CBucket implements Cloneable, } - /** * Append a string to the buffer */ diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOBuffer.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOBuffer.java index a9777a081..70e779543 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOBuffer.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOBuffer.java @@ -238,9 +238,8 @@ public class IOBuffer { } hasDataLock.waitSignal(timeMs); } - - + public boolean isAppendClosed() { return closeQueued; } @@ -645,7 +644,6 @@ public class IOBuffer { } } - // ------ More utilities - for parsing request ( later )------- // public final int skipBlank(ByteBuffer bb, int start) { diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOWriter.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOWriter.java index 0c84f6841..2def8e8ba 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOWriter.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOWriter.java @@ -185,9 +185,8 @@ public class IOWriter extends Writer { return i; } - - + /** * Just send the chars to the byte[], without flushing down. * diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/NioThread.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/NioThread.java index 75c4457ae..3b6e64925 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/NioThread.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/NioThread.java @@ -739,7 +739,6 @@ public class NioThread implements Runnable { } - public void acceptor(NioChannelCallback cstate, int port, InetAddress inet, @@ -1141,9 +1140,8 @@ public class NioThread implements Runnable { } } } - - - + + protected boolean isSelectorThread() { return Thread.currentThread() == selectorThread; } diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SocketConnector.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SocketConnector.java index 0b9a09e78..93bae2ad4 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SocketConnector.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SocketConnector.java @@ -127,7 +127,6 @@ public class SocketConnector extends IOConnector { } - // TODO: suspendAccept(boolean) } diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SocketIOChannel.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SocketIOChannel.java index 2a8c3b9f3..88a964d9b 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SocketIOChannel.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SocketIOChannel.java @@ -202,9 +202,8 @@ public class SocketIOChannel extends IOChannel implements NioChannelCallback { public static final void releaseReadableBuffer(ByteBuffer bb, BBucket bucket) { bucket.position(bb.position()); } - - - + + public void readInterest(boolean b) throws IOException { ch.readInterest(b); } diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/jsse/SslChannel.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/jsse/SslChannel.java index 9f76f5308..df4425b31 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/io/jsse/SslChannel.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/io/jsse/SslChannel.java @@ -359,7 +359,6 @@ class SslChannel extends IOChannel implements Runnable { } - // SSL handshake require slow tasks - that will need to be executed in a // thread anyways. Better to keep it simple ( the code is very complex ) - // and do the initial handshake in a thread, not in the IO thread. diff --git a/modules/tomcat-lite/java/org/apache/tomcat/lite/proxy/SocksServer.java b/modules/tomcat-lite/java/org/apache/tomcat/lite/proxy/SocksServer.java index 3dc58bd3b..8170afed1 100644 --- a/modules/tomcat-lite/java/org/apache/tomcat/lite/proxy/SocksServer.java +++ b/modules/tomcat-lite/java/org/apache/tomcat/lite/proxy/SocksServer.java @@ -139,8 +139,7 @@ public class SocksServer implements Runnable, IOConnector.ConnectedCallback { } - - + public static class SocksServerConnection implements IOConnector.DataReceivedCallback, IOConnector.ConnectedCallback { protected SocksServer server; diff --git a/modules/tomcat-lite/test/org/apache/coyote/lite/Tomcat.java b/modules/tomcat-lite/test/org/apache/coyote/lite/Tomcat.java index 412418a0d..880165b69 100644 --- a/modules/tomcat-lite/test/org/apache/coyote/lite/Tomcat.java +++ b/modules/tomcat-lite/test/org/apache/coyote/lite/Tomcat.java @@ -481,10 +481,7 @@ public class Tomcat { return ctx; } - - - // ---------- Helper methods and classes ------------------- /** diff --git a/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelTest.java b/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelTest.java index 0296e85a8..b49dea2af 100644 --- a/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelTest.java +++ b/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelTest.java @@ -123,7 +123,6 @@ public class HttpChannelTest extends TestCase { responseTest("HTTP/1.1 200", "HTTP/1.1", "200", ""); responseTest("HTTP/1.1", "HTTP/1.1", "", ""); } - - + } diff --git a/modules/tomcat-lite/test/org/apache/tomcat/lite/io/UEncoderTest.java b/modules/tomcat-lite/test/org/apache/tomcat/lite/io/UEncoderTest.java index 1bf389a00..f48a61c61 100644 --- a/modules/tomcat-lite/test/org/apache/tomcat/lite/io/UEncoderTest.java +++ b/modules/tomcat-lite/test/org/apache/tomcat/lite/io/UEncoderTest.java @@ -39,7 +39,6 @@ public class UEncoderTest extends TestCase { dec.urlEncode(uri, cc, enc); return cc.toString(); } - - + } diff --git a/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/CookieController.java b/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/CookieController.java index f6d069935..f63bd1a0e 100644 --- a/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/CookieController.java +++ b/modules/tomcat-lite/test/org/apache/tomcat/test/watchdog/CookieController.java @@ -75,8 +75,6 @@ public class CookieController { */ - - for (int hi = 0; hiCRBufferedInputStream is a modified version of * the java.io.BufferedInputStream class. The fill code is diff --git a/test/org/apache/catalina/tribes/demos/CoordinationDemo.java b/test/org/apache/catalina/tribes/demos/CoordinationDemo.java index 770b203f2..0bc00e1f1 100644 --- a/test/org/apache/catalina/tribes/demos/CoordinationDemo.java +++ b/test/org/apache/catalina/tribes/demos/CoordinationDemo.java @@ -31,7 +31,6 @@ import org.apache.catalina.tribes.transport.ReceiverBase; import org.apache.catalina.tribes.util.Arrays; - public class CoordinationDemo { static int CHANNEL_COUNT = 5; static int SCREEN_WIDTH = 120; @@ -185,9 +184,8 @@ public class CoordinationDemo { statusLine.delete(0,statusLine.length()); statusLine.append(status); } - - - + + public static void setEvents(String events) { java.util.Arrays.fill(VIEW_EVENTS,false); StringTokenizer t = new StringTokenizer(events,","); diff --git a/test/org/apache/catalina/tribes/demos/LoadTest.java b/test/org/apache/catalina/tribes/demos/LoadTest.java index 15cc09bf3..358a1ce47 100644 --- a/test/org/apache/catalina/tribes/demos/LoadTest.java +++ b/test/org/apache/catalina/tribes/demos/LoadTest.java @@ -95,8 +95,7 @@ public class LoadTest implements MembershipListener,ChannelListener, Runnable { "\n\tMBytes/second:"+(size*cnt/time/1024f/1024f)); } - - + public LoadTest(ManagedChannel channel, boolean send, int msgCount, @@ -112,9 +111,8 @@ public class LoadTest implements MembershipListener,ChannelListener, Runnable { this.statsInterval = stats; this.breakonChannelException = breakOnEx; } - - - + + public void run() { long counter = 0; @@ -171,7 +169,6 @@ public class LoadTest implements MembershipListener,ChannelListener, Runnable { endTest(); } - /** * memberAdded @@ -246,8 +243,7 @@ public class LoadTest implements MembershipListener,ChannelListener, Runnable { System.out.println("} size:"+data.length); } - - + public static class LoadMessage extends ByteMessage { public static byte[] outdata = new byte[size]; diff --git a/test/org/apache/catalina/tribes/test/interceptors/TestNonBlockingCoordinator.java b/test/org/apache/catalina/tribes/test/interceptors/TestNonBlockingCoordinator.java index 9f2b0561d..f1e2c2796 100644 --- a/test/org/apache/catalina/tribes/test/interceptors/TestNonBlockingCoordinator.java +++ b/test/org/apache/catalina/tribes/test/interceptors/TestNonBlockingCoordinator.java @@ -107,9 +107,6 @@ public class TestNonBlockingCoordinator extends TestCase { suite.addTestSuite(TestNonBlockingCoordinator.class); suite.run(new TestResult()); } - - - - + } diff --git a/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java b/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java index d99deedec..5368b8c91 100644 --- a/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java +++ b/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java @@ -188,9 +188,6 @@ public class TestOrderInterceptor extends TestCase { } } } - - - - + } diff --git a/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java b/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java index 5c62db37f..22733e612 100644 --- a/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java +++ b/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java @@ -127,7 +127,6 @@ public class TestSenderConnections extends TestCase { } - } } diff --git a/test/org/apache/el/TestELEvaluation.java b/test/org/apache/el/TestELEvaluation.java index 33e231be6..2e103a47c 100644 --- a/test/org/apache/el/TestELEvaluation.java +++ b/test/org/apache/el/TestELEvaluation.java @@ -133,9 +133,8 @@ public class TestELEvaluation extends TestCase { assertEquals("\\$", evaluateExpression("${'\\\\$'}")); assertEquals("\\\\$", evaluateExpression("${'\\\\\\\\$'}")); - - - + + // Can use ''' inside '"' when quoting with '"' and vice versa without // escaping assertEquals("\\\"", evaluateExpression("${'\\\\\"'}")); @@ -185,7 +184,6 @@ public class TestELEvaluation extends TestCase { } - // ************************************************************************ private String evaluateExpression(String expression) { diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml index dbe8bcb75..03afde6fe 100644 --- a/webapps/docs/cluster-howto.xml +++ b/webapps/docs/cluster-howto.xml @@ -232,7 +232,6 @@ should be completed:

-
@@ -617,10 +616,6 @@ should be completed:

- - - -

Monitoring is a very important question when you use a cluster. Some of the cluster objects are JMX MBeans

Add the following parameter to your startup script with Java 5: diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 302e92615..20d59e53e 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -314,7 +314,6 @@ - diff --git a/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java b/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java index fd5ce9bc1..f21ba56c2 100644 --- a/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java +++ b/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java @@ -50,8 +50,7 @@ public class AsyncStockServlet extends HttpServlet implements TickListener, Asyn public AsyncStockServlet() { System.out.println("AsyncStockServlet created"); } - - + @Override protected void service(HttpServletRequest req, HttpServletResponse resp) @@ -73,7 +72,6 @@ public class AsyncStockServlet extends HttpServlet implements TickListener, Asyn } - @Override public void tick(Stock stock) { ticks.add((Stock)stock.clone()); @@ -122,7 +120,6 @@ public class AsyncStockServlet extends HttpServlet implements TickListener, Asyn } - @Override public void onStartAsync(AsyncEvent event) throws IOException { // NOOP diff --git a/webapps/examples/WEB-INF/classes/cal/JspCalendar.java b/webapps/examples/WEB-INF/classes/cal/JspCalendar.java index 0552a97ac..110944340 100644 --- a/webapps/examples/WEB-INF/classes/cal/JspCalendar.java +++ b/webapps/examples/WEB-INF/classes/cal/JspCalendar.java @@ -149,6 +149,3 @@ public class JspCalendar { } - - - diff --git a/webapps/examples/WEB-INF/classes/examples/LogTag.java b/webapps/examples/WEB-INF/classes/examples/LogTag.java index 2be11d674..bb0289e24 100644 --- a/webapps/examples/WEB-INF/classes/examples/LogTag.java +++ b/webapps/examples/WEB-INF/classes/examples/LogTag.java @@ -58,6 +58,4 @@ public class LogTag extends ExampleTagBase { } } - - - + diff --git a/webapps/examples/WEB-INF/classes/examples/ShowSource.java b/webapps/examples/WEB-INF/classes/examples/ShowSource.java index 72c10cc86..9194bda5e 100644 --- a/webapps/examples/WEB-INF/classes/examples/ShowSource.java +++ b/webapps/examples/WEB-INF/classes/examples/ShowSource.java @@ -71,6 +71,4 @@ public class ShowSource extends TagSupport { } } - - - + diff --git a/webapps/examples/jsp/cal/cal1.jsp b/webapps/examples/jsp/cal/cal1.jsp index e9d1924d2..42d41976e 100644 --- a/webapps/examples/jsp/cal/cal1.jsp +++ b/webapps/examples/jsp/cal/cal1.jsp @@ -91,5 +91,3 @@ - - -- 2.11.0