Author: markt
Date: Thu Jun 2 13:13:09 2016
New Revision: 1746559
URL: http://svn.apache.org/viewvc?rev=1746559&view=rev
Log:
Remove unnecessary method
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 2 13:13:09 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1746559&r1=1746558&r2=1746559&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu
Jun 2 13:13:09 2016
@@ -2471,7 +2471,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/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1746559&r1=1746558&r2=1746559&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu
Jun 2 13:13:09 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/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1746559&r1=1746558&r2=1746559&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu
Jun 2 13:13:09 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/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1746559&r1=1746558&r2=1746559&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Thu Jun 2 13:13:09 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
