Author: markt
Date: Thu Jun 2 13:08:52 2016
New Revision: 1746555
URL: http://svn.apache.org/viewvc?rev=1746555&view=rev
Log:
Pull up synchronization block
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/SocketProcessorBase.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 2 13:08:52 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,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
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=1746555&r1=1746554&r2=1746555&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:08:52 2016
@@ -2252,20 +2252,17 @@ public class AprEndpoint extends Abstrac
*/
protected class SocketProcessor extends SocketProcessorBase<Long> {
- public SocketProcessor(SocketWrapperBase<Long> socket,
- SocketEvent event) {
- super(socket, event);
+ public SocketProcessor(SocketWrapperBase<Long> socketWrapper,
SocketEvent event) {
+ super(socketWrapper, event);
}
@Override
- public void run() {
- synchronized (socketWrapper) {
- // Process the request from this socket
- SocketState state = getHandler().process(socketWrapper, event);
- if (state == Handler.SocketState.CLOSED) {
- // Close socket and pool
- closeSocket(socketWrapper.getSocket().longValue());
- }
+ protected void doRun() {
+ // Process the request from this socket
+ SocketState state = getHandler().process(socketWrapper, event);
+ if (state == Handler.SocketState.CLOSED) {
+ // Close socket and pool
+ closeSocket(socketWrapper.getSocket().longValue());
}
}
}
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=1746555&r1=1746554&r2=1746555&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:08:52 2016
@@ -1623,95 +1623,93 @@ public class Nio2Endpoint extends Abstra
}
@Override
- public void run() {
- synchronized (socketWrapper) {
- if (SocketEvent.OPEN_WRITE != event) {
- // Anything other than OPEN_WRITE is a genuine read or an
- // error condition so for all of those release the
semaphore
- ((Nio2SocketWrapper) socketWrapper).releaseReadPending();
- }
- boolean launch = false;
- try {
- int handshake = -1;
+ protected void doRun() {
+ if (SocketEvent.OPEN_WRITE != event) {
+ // Anything other than OPEN_WRITE is a genuine read or an
+ // error condition so for all of those release the semaphore
+ ((Nio2SocketWrapper) socketWrapper).releaseReadPending();
+ }
+ boolean launch = false;
+ try {
+ int handshake = -1;
- try {
- // For STOP there is no point trying to handshake as
the
- // Poller has been stopped.
- if (!socketWrapper.getSocket().isHandshakeComplete()
&& event == SocketEvent.ERROR) {
- handshake = -1;
- } else if
(socketWrapper.getSocket().isHandshakeComplete() ||
- event == SocketEvent.STOP ||
- event == SocketEvent.ERROR) {
- handshake = 0;
- } else {
- handshake = socketWrapper.getSocket().handshake();
- // The handshake process reads/writes from/to the
- // socket. status may therefore be OPEN_WRITE once
- // the handshake completes. However, the handshake
- // happens when the socket is opened so the status
- // must always be OPEN_READ after it completes. It
- // is OK to always set this as it is only used if
- // the handshake completes.
- event = SocketEvent.OPEN_READ;
- }
- } catch (IOException x) {
+ try {
+ // For STOP there is no point trying to handshake as the
+ // Poller has been stopped.
+ if (!socketWrapper.getSocket().isHandshakeComplete() &&
event == SocketEvent.ERROR) {
handshake = -1;
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("endpoint.err.handshake"),
x);
- }
+ } else if (socketWrapper.getSocket().isHandshakeComplete()
||
+ event == SocketEvent.STOP ||
+ event == SocketEvent.ERROR) {
+ handshake = 0;
+ } else {
+ handshake = socketWrapper.getSocket().handshake();
+ // The handshake process reads/writes from/to the
+ // socket. status may therefore be OPEN_WRITE once
+ // the handshake completes. However, the handshake
+ // happens when the socket is opened so the status
+ // must always be OPEN_READ after it completes. It
+ // is OK to always set this as it is only used if
+ // the handshake completes.
+ event = SocketEvent.OPEN_READ;
}
- if (handshake == 0) {
- SocketState state = SocketState.OPEN;
- // Process the request from this socket
- if (event == null) {
- state = getHandler().process(socketWrapper,
SocketEvent.OPEN_READ);
- } else {
- state = getHandler().process(socketWrapper, event);
- }
- if (state == SocketState.CLOSED) {
- // Close socket and pool
- closeSocket(socketWrapper);
- if (running && !paused) {
- if
(!nioChannels.push(socketWrapper.getSocket())) {
- socketWrapper.getSocket().free();
- }
- }
- } else if (state == SocketState.UPGRADING) {
- launch = true;
- }
- } else if (handshake == -1 ) {
+ } catch (IOException x) {
+ handshake = -1;
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("endpoint.err.handshake"), x);
+ }
+ }
+ if (handshake == 0) {
+ SocketState state = SocketState.OPEN;
+ // Process the request from this socket
+ if (event == null) {
+ state = getHandler().process(socketWrapper,
SocketEvent.OPEN_READ);
+ } else {
+ state = getHandler().process(socketWrapper, event);
+ }
+ if (state == SocketState.CLOSED) {
+ // Close socket and pool
closeSocket(socketWrapper);
if (running && !paused) {
if (!nioChannels.push(socketWrapper.getSocket())) {
socketWrapper.getSocket().free();
}
}
+ } else if (state == SocketState.UPGRADING) {
+ launch = true;
}
- } catch (VirtualMachineError vme) {
- ExceptionUtils.handleThrowable(vme);
- } catch (Throwable t) {
- log.error(sm.getString("endpoint.processing.fail"), t);
- if (socketWrapper != null) {
- closeSocket(socketWrapper);
- }
- } finally {
- if (launch) {
- try {
- getExecutor().execute(new
SocketProcessor(socketWrapper, SocketEvent.OPEN_READ));
- } catch (NullPointerException npe) {
- if (running) {
- log.error(sm.getString("endpoint.launch.fail"),
- npe);
- }
+ } else if (handshake == -1 ) {
+ closeSocket(socketWrapper);
+ if (running && !paused) {
+ if (!nioChannels.push(socketWrapper.getSocket())) {
+ socketWrapper.getSocket().free();
}
}
- socketWrapper = null;
- event = null;
- //return to cache
- if (running && !paused) {
- processorCache.push(this);
+ }
+ } catch (VirtualMachineError vme) {
+ ExceptionUtils.handleThrowable(vme);
+ } catch (Throwable t) {
+ log.error(sm.getString("endpoint.processing.fail"), t);
+ if (socketWrapper != null) {
+ closeSocket(socketWrapper);
+ }
+ } finally {
+ if (launch) {
+ try {
+ getExecutor().execute(new
SocketProcessor(socketWrapper, SocketEvent.OPEN_READ));
+ } catch (NullPointerException npe) {
+ if (running) {
+ log.error(sm.getString("endpoint.launch.fail"),
+ npe);
+ }
}
}
+ socketWrapper = null;
+ event = null;
+ //return to cache
+ if (running && !paused) {
+ processorCache.push(this);
+ }
}
}
}
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=1746555&r1=1746554&r2=1746555&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:08:52 2016
@@ -1422,82 +1422,76 @@ public class NioEndpoint extends Abstrac
*/
protected class SocketProcessor extends SocketProcessorBase<NioChannel> {
- public SocketProcessor(SocketWrapperBase<NioChannel> ka, SocketEvent
event) {
- super(ka, event);
+ public SocketProcessor(SocketWrapperBase<NioChannel> socketWrapper,
SocketEvent event) {
+ super(socketWrapper, event);
}
@Override
- public void run() {
+ protected void doRun() {
NioChannel socket = socketWrapper.getSocket();
- SelectionKey key = socket.getIOChannel().keyFor(
- socket.getPoller().getSelector());
+ SelectionKey key =
socket.getIOChannel().keyFor(socket.getPoller().getSelector());
- synchronized (socket) {
- try {
- int handshake = -1;
+ try {
+ int handshake = -1;
- try {
- if (key != null) {
- // For STOP there is no point trying to handshake
as the
- // Poller has been stopped.
- if (socket.isHandshakeComplete() ||
- event == SocketEvent.STOP) {
- handshake = 0;
- } else {
- handshake = socket.handshake(
- key.isReadable(), key.isWritable());
- // The handshake process reads/writes from/to
the
- // socket. status may therefore be OPEN_WRITE
once
- // the handshake completes. However, the
handshake
- // happens when the socket is opened so the
status
- // must always be OPEN_READ after it
completes. It
- // is OK to always set this as it is only used
if
- // the handshake completes.
- event = SocketEvent.OPEN_READ;
- }
- }
- } catch (IOException x) {
- handshake = -1;
- if (log.isDebugEnabled()) log.debug("Error during SSL
handshake",x);
- } catch (CancelledKeyException ckx) {
- handshake = -1;
- }
- if (handshake == 0) {
- SocketState state = SocketState.OPEN;
- // Process the request from this socket
- if (event == null) {
- state = getHandler().process(socketWrapper,
SocketEvent.OPEN_READ);
+ try {
+ if (key != null) {
+ // For STOP there is no point trying to handshake as
the
+ // Poller has been stopped.
+ if (socket.isHandshakeComplete() || event ==
SocketEvent.STOP) {
+ handshake = 0;
} else {
- state = getHandler().process(socketWrapper, event);
- }
- if (state == SocketState.CLOSED) {
- close(socket, key);
+ handshake = socket.handshake(key.isReadable(),
key.isWritable());
+ // The handshake process reads/writes from/to the
+ // socket. status may therefore be OPEN_WRITE once
+ // the handshake completes. However, the handshake
+ // happens when the socket is opened so the status
+ // must always be OPEN_READ after it completes. It
+ // is OK to always set this as it is only used if
+ // the handshake completes.
+ event = SocketEvent.OPEN_READ;
}
- } else if (handshake == -1 ) {
- close(socket, key);
- } else if (handshake == SelectionKey.OP_READ){
- socketWrapper.registerReadInterest();
- } else if (handshake == SelectionKey.OP_WRITE){
- socketWrapper.registerWriteInterest();
}
- } catch (CancelledKeyException cx) {
- socket.getPoller().cancelledKey(key);
- } catch (VirtualMachineError vme) {
- ExceptionUtils.handleThrowable(vme);
- } catch (Throwable t) {
- log.error("", t);
- socket.getPoller().cancelledKey(key);
- } finally {
- socketWrapper = null;
- event = null;
- //return to cache
- if (running && !paused) {
- processorCache.push(this);
+ } catch (IOException x) {
+ handshake = -1;
+ if (log.isDebugEnabled()) log.debug("Error during SSL
handshake",x);
+ } catch (CancelledKeyException ckx) {
+ handshake = -1;
+ }
+ if (handshake == 0) {
+ SocketState state = SocketState.OPEN;
+ // Process the request from this socket
+ if (event == null) {
+ state = getHandler().process(socketWrapper,
SocketEvent.OPEN_READ);
+ } else {
+ state = getHandler().process(socketWrapper, event);
+ }
+ if (state == SocketState.CLOSED) {
+ close(socket, key);
}
+ } else if (handshake == -1 ) {
+ close(socket, key);
+ } else if (handshake == SelectionKey.OP_READ){
+ socketWrapper.registerReadInterest();
+ } else if (handshake == SelectionKey.OP_WRITE){
+ socketWrapper.registerWriteInterest();
+ }
+ } catch (CancelledKeyException cx) {
+ socket.getPoller().cancelledKey(key);
+ } catch (VirtualMachineError vme) {
+ ExceptionUtils.handleThrowable(vme);
+ } catch (Throwable t) {
+ log.error("", t);
+ socket.getPoller().cancelledKey(key);
+ } finally {
+ socketWrapper = null;
+ event = null;
+ //return to cache
+ if (running && !paused) {
+ processorCache.push(this);
}
}
}
-
}
// ----------------------------------------------- SendfileData Inner Class
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketProcessorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketProcessorBase.java?rev=1746555&r1=1746554&r2=1746555&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketProcessorBase.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketProcessorBase.java
Thu Jun 2 13:08:52 2016
@@ -36,4 +36,15 @@ public abstract class SocketProcessorBas
this.event = event;
}
}
+
+
+ @Override
+ public final void run() {
+ synchronized (socketWrapper) {
+ doRun();
+ }
+ }
+
+
+ protected abstract void doRun();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
