Author: markt
Date: Wed Jun 1 19:16:48 2016
New Revision: 1746490
URL: http://svn.apache.org/viewvc?rev=1746490&view=rev
Log:
Remove unnecessary method
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1746490&r1=1746489&r2=1746490&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Jun 1
19:16:48 2016
@@ -2465,7 +2465,7 @@ public class AprEndpoint extends Abstrac
@Override
- protected void doWriteInternal(boolean block) throws IOException {
+ protected void doWrite(boolean block) throws IOException {
if (closed) {
throw new IOException(sm.getString("socket.apr.closed",
getSocket()));
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1746490&r1=1746489&r2=1746490&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Wed Jun 1
19:16:48 2016
@@ -1218,7 +1218,7 @@ public class Nio2Endpoint extends Abstra
* blocking case
*/
@Override
- protected void doWriteInternal(boolean block) throws IOException {
+ protected void doWrite(boolean block) throws IOException {
Future<Integer> integer = null;
try {
socketBufferHandler.configureWriteBufferForRead();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1746490&r1=1746489&r2=1746490&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Jun 1
19:16:48 2016
@@ -435,18 +435,18 @@ public class NioEndpoint extends Abstrac
@Override
public void processSocket(SocketWrapperBase<NioChannel> socketWrapper,
- SocketEvent socketStatus, boolean dispatch) {
- processSocket((NioSocketWrapper) socketWrapper, socketStatus,
dispatch);
+ SocketEvent event, boolean dispatch) {
+ processSocket((NioSocketWrapper) socketWrapper, event, dispatch);
}
- protected boolean processSocket(NioSocketWrapper attachment, SocketEvent
status, boolean dispatch) {
+ protected boolean processSocket(NioSocketWrapper socketWrapper,
SocketEvent event, boolean dispatch) {
try {
- if (attachment == null) {
+ if (socketWrapper == null) {
return false;
}
SocketProcessor sc = processorCache.pop();
- if ( sc == null ) sc = new SocketProcessor(attachment, status);
- else sc.reset(attachment, status);
+ if ( sc == null ) sc = new SocketProcessor(socketWrapper, event);
+ else sc.reset(socketWrapper, event);
Executor executor = getExecutor();
if (dispatch && executor != null) {
executor.execute(sc);
@@ -454,7 +454,7 @@ public class NioEndpoint extends Abstrac
sc.run();
}
} catch (RejectedExecutionException ree) {
- log.warn(sm.getString("endpoint.executor.fail",
attachment.getSocket()), ree);
+ log.warn(sm.getString("endpoint.executor.fail",
socketWrapper.getSocket()), ree);
return false;
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
@@ -1269,7 +1269,7 @@ public class NioEndpoint extends Abstrac
@Override
- protected synchronized void doWriteInternal(boolean block) throws
IOException {
+ protected synchronized void doWrite(boolean block) throws IOException {
socketBufferHandler.configureWriteBufferForRead();
long writeTimeout = getWriteTimeout();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1746490&r1=1746489&r2=1746490&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Wed Jun
1 19:16:48 2016
@@ -475,19 +475,6 @@ public abstract class SocketWrapperBase<
return !socketBufferHandler.isWriteBufferEmpty();
}
- /**
- * Write the contents of the socketWriteBuffer to the socket. For blocking
- * writes either then entire contents of the buffer will be written or an
- * IOException will be thrown. Partial blocking writes will not occur.
- *
- * @param block Should the write be blocking or not?
- *
- * @throws IOException If an I/O error such as a timeout occurs during the
- * write
- */
- protected final void doWrite(boolean block) throws IOException {
- doWriteInternal(block);
- }
/**
* Write the contents of the socketWriteBuffer to the socket. For blocking
@@ -499,7 +486,7 @@ public abstract class SocketWrapperBase<
* @throws IOException If an I/O error such as a timeout occurs during the
* write
*/
- protected abstract void doWriteInternal(boolean block) throws IOException;
+ protected abstract void doWrite(boolean block) throws IOException;
protected void addToBuffers(byte[] buf, int offset, int length) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
