Author: markt
Date: Thu Oct 20 17:15:59 2011
New Revision: 1186935
URL: http://svn.apache.org/viewvc?rev=1186935&view=rev
Log:
Clean-up. No functional change.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 17:15:59 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186891-1186892,1186894
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1186935&r1=1186934&r2=1186935&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
Thu Oct 20 17:15:59 2011
@@ -61,7 +61,7 @@ public class Http11AprProcessor extends
int maxTrailerSize) {
super(endpoint);
-
+
inputBuffer = new InternalAprInputBuffer(request, headerBufferSize);
request.setInputBuffer(inputBuffer);
@@ -106,7 +106,7 @@ public class Http11AprProcessor extends
* provider is used to perform the conversion. For example it is used with
* the AJP connectors, the HTTP APR connector and with the
* {@link org.apache.catalina.valves.SSLValve}. If not specified, the
- * default provider will be used.
+ * default provider will be used.
*/
protected String clientCertProvider = null;
public String getClientCertProvider() { return clientCertProvider; }
@@ -125,9 +125,9 @@ public class Http11AprProcessor extends
@Override
public SocketState event(SocketStatus status)
throws IOException {
-
+
RequestInfo rp = request.getRequestProcessor();
-
+
try {
rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
error = !adapter.event(request, response, status);
@@ -141,7 +141,7 @@ public class Http11AprProcessor extends
adapter.log(request, response, 0);
error = true;
}
-
+
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
if (error) {
@@ -154,7 +154,7 @@ public class Http11AprProcessor extends
return SocketState.LONG;
}
}
-
+
@Override
protected boolean disableKeepAlive() {
return false;
@@ -168,10 +168,10 @@ public class Http11AprProcessor extends
// APR uses simulated blocking so if some request line data is present
// then it must all be presented (with the normal socket timeout).
-
+
// When entering the processing loop for the first time there will
// always be some data to read so the keep-alive timeout is not
required
-
+
// For the second and subsequent executions of the processing loop, if
// there is no request line data present then no further data will be
// read from the socket. If there is request line data present then it
@@ -180,7 +180,7 @@ public class Http11AprProcessor extends
// When the socket is created it is given the correct timeout.
// sendfile may change the timeout but will restore it
// This processor may change the timeout for uploads but will restore
it
-
+
// NO-OP
}
@@ -207,8 +207,8 @@ public class Http11AprProcessor extends
protected void setSocketTimeout(int timeout) {
Socket.timeoutSet(socket.getSocket().longValue(), timeout * 1000);
}
-
-
+
+
@Override
protected void setCometTimeouts(SocketWrapper<Long> socketWrapper) {
// NO-OP for APR/native
@@ -255,7 +255,7 @@ public class Http11AprProcessor extends
socket = null;
sendfileData = null;
}
-
+
// ----------------------------------------------------- ActionHook Methods
@@ -270,7 +270,7 @@ public class Http11AprProcessor extends
public void actionInternal(ActionCode actionCode, Object param) {
long socketRef = socket.getSocket().longValue();
-
+
if (actionCode == ActionCode.REQ_HOST_ADDR_ATTRIBUTE) {
// Get remote host address
@@ -373,10 +373,10 @@ public class Http11AprProcessor extends
certs = new X509Certificate[certLength + 1];
CertificateFactory cf;
if (clientCertProvider == null) {
- cf = CertificateFactory.getInstance("X.509");
+ cf = CertificateFactory.getInstance("X.509");
} else {
cf = CertificateFactory.getInstance("X.509",
- clientCertProvider);
+ clientCertProvider);
}
certs[0] = (X509Certificate)
cf.generateCertificate(new ByteArrayInputStream(clientCert));
for (int i = 0; i < certLength; i++) {
@@ -420,7 +420,7 @@ public class Http11AprProcessor extends
if (SSLSocket.renegotiate(socketRef) == 0) {
// Don't look for certs unless we know renegotiation
worked.
// Get client certificate and the certificate chain if
present
- // certLength == -1 indicates an error
+ // certLength == -1 indicates an error
int certLength =
SSLSocket.getInfoI(socketRef,SSL.SSL_INFO_CLIENT_CERT_CHAIN);
byte[] clientCert = SSLSocket.getInfoB(socketRef,
SSL.SSL_INFO_CLIENT_CERT);
X509Certificate[] certs = null;
@@ -459,7 +459,9 @@ public class Http11AprProcessor extends
SocketStatus.OPEN);
}
} else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
- if (param==null) return;
+ if (param==null) {
+ return;
+ }
long timeout = ((Long)param).longValue();
socket.setTimeout(timeout);
} else if (actionCode == ActionCode.ASYNC_DISPATCH) {
@@ -468,7 +470,7 @@ public class Http11AprProcessor extends
SocketStatus.OPEN);
}
}
-
+
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1186935&r1=1186934&r2=1186935&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Thu Oct 20 17:15:59 2011
@@ -127,7 +127,9 @@ public class Http11NioProcessor extends
attach.setComet(comet);
if (comet) {
Integer comettimeout = (Integer)
request.getAttribute("org.apache.tomcat.comet.timeout");
- if (comettimeout != null)
attach.setTimeout(comettimeout.longValue());
+ if (comettimeout != null) {
+ attach.setTimeout(comettimeout.longValue());
+ }
} else {
//reset the timeout
if (keepAlive) {
@@ -166,7 +168,7 @@ public class Http11NioProcessor extends
return SocketState.LONG;
}
}
-
+
@Override
protected void resetTimeouts() {
@@ -200,14 +202,14 @@ public class Http11NioProcessor extends
// When entering the processing loop there will always be data to read
// so no point changing timeouts at this point
-
+
// For the second and subsequent executions of the processing loop, a
// non-blocking read is used so again no need to set the timeouts
-
+
// Because NIO supports non-blocking reading of the request line and
// headers the timeouts need to be set when returning the socket to
// the poller rather than here.
-
+
// NO-OP
}
@@ -248,7 +250,7 @@ public class Http11NioProcessor extends
socket.getSocket().getIOChannel().socket().setSoTimeout(timeout);
}
-
+
@Override
protected void setCometTimeouts(SocketWrapper<NioChannel> socketWrapper) {
// Comet support
@@ -260,7 +262,9 @@ public class Http11NioProcessor extends
attach.setComet(comet);
if (comet) {
Integer comettimeout = (Integer)
request.getAttribute("org.apache.tomcat.comet.timeout");
- if (comettimeout != null)
attach.setTimeout(comettimeout.longValue());
+ if (comettimeout != null) {
+ attach.setTimeout(comettimeout.longValue());
+ }
}
}
}
@@ -347,8 +351,9 @@ public class Http11NioProcessor extends
} else if (actionCode == ActionCode.REQ_LOCAL_ADDR_ATTRIBUTE) {
- if (localAddr == null)
- localAddr =
socket.getSocket().getIOChannel().socket().getLocalAddress().getHostAddress();
+ if (localAddr == null) {
+ localAddr =
socket.getSocket().getIOChannel().socket().getLocalAddress().getHostAddress();
+ }
request.localAddr().setString(localAddr);
@@ -371,21 +376,25 @@ public class Http11NioProcessor extends
try {
if (sslSupport != null) {
Object sslO = sslSupport.getCipherSuite();
- if (sslO != null)
+ if (sslO != null) {
request.setAttribute
(SSLSupport.CIPHER_SUITE_KEY, sslO);
+ }
sslO = sslSupport.getPeerCertificateChain(false);
- if (sslO != null)
+ if (sslO != null) {
request.setAttribute
(SSLSupport.CERTIFICATE_KEY, sslO);
+ }
sslO = sslSupport.getKeySize();
- if (sslO != null)
+ if (sslO != null) {
request.setAttribute
(SSLSupport.KEY_SIZE_KEY, sslO);
+ }
sslO = sslSupport.getSessionId();
- if (sslO != null)
+ if (sslO != null) {
request.setAttribute
(SSLSupport.SESSION_ID_KEY, sslO);
+ }
request.setAttribute(SSLSupport.SESSION_MGR, sslSupport);
}
} catch (Exception e) {
@@ -439,7 +448,9 @@ public class Http11NioProcessor extends
} else if (actionCode == ActionCode.COMET_END) {
comet = false;
} else if (actionCode == ActionCode.COMET_CLOSE) {
- if (socket==null || socket.getSocket().getAttachment(false)==null)
return;
+ if (socket==null || socket.getSocket().getAttachment(false)==null)
{
+ return;
+ }
NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment)socket.getSocket().getAttachment(false);
attach.setCometOps(NioEndpoint.OP_CALLBACK);
RequestInfo rp = request.getRequestProcessor();
@@ -450,22 +461,31 @@ public class Http11NioProcessor extends
socket.getSocket().getPoller().add(socket.getSocket());
}
} else if (actionCode == ActionCode.COMET_SETTIMEOUT) {
- if (param==null) return;
- if (socket==null || socket.getSocket().getAttachment(false)==null)
return;
+ if (param==null) {
+ return;
+ }
+ if (socket==null || socket.getSocket().getAttachment(false)==null)
{
+ return;
+ }
NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment)socket.getSocket().getAttachment(false);
long timeout = ((Long)param).longValue();
//if we are not piggy backing on a worker thread, set the timeout
RequestInfo rp = request.getRequestProcessor();
- if ( rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE )
//async handling
+ if ( rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE ) {
attach.setTimeout(timeout);
+ }
} else if (actionCode == ActionCode.ASYNC_COMPLETE) {
if (asyncStateMachine.asyncComplete()) {
((NioEndpoint)endpoint).processSocket(this.socket.getSocket(),
SocketStatus.OPEN, true);
}
} else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
- if (param==null) return;
- if (socket==null || socket.getSocket().getAttachment(false)==null)
return;
+ if (param==null) {
+ return;
+ }
+ if (socket==null || socket.getSocket().getAttachment(false)==null)
{
+ return;
+ }
NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment)socket.getSocket().getAttachment(false);
long timeout = ((Long)param).longValue();
//if we are not piggy backing on a worker thread, set the timeout
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
