Author: markt
Date: Fri Jan 6 19:30:14 2012
New Revision: 1228360
URL: http://svn.apache.org/viewvc?rev=1228360&view=rev
Log:
Remove some unnecessary code that may be a cause of fd leaks
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.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=1228360&r1=1228359&r2=1228360&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Jan 6
19:30:14 2012
@@ -864,31 +864,9 @@ public class AprEndpoint extends Abstrac
*/
protected boolean processSocket(long socket, SocketStatus status) {
try {
- if (status == SocketStatus.OPEN || status == SocketStatus.STOP ||
- status == SocketStatus.TIMEOUT) {
- SocketWrapper<Long> wrapper =
+ SocketWrapper<Long> wrapper =
new SocketWrapper<Long>(Long.valueOf(socket));
- SocketEventProcessor proc =
- new SocketEventProcessor(wrapper, status);
- ClassLoader loader =
Thread.currentThread().getContextClassLoader();
- try {
- if (Constants.IS_SECURITY_ENABLED) {
- PrivilegedAction<Void> pa = new PrivilegedSetTccl(
- getClass().getClassLoader());
- AccessController.doPrivileged(pa);
- } else {
- Thread.currentThread().setContextClassLoader(
- getClass().getClassLoader());
- }
- getExecutor().execute(proc);
- } finally {
- if (Constants.IS_SECURITY_ENABLED) {
- PrivilegedAction<Void> pa = new
PrivilegedSetTccl(loader);
- AccessController.doPrivileged(pa);
- } else {
- Thread.currentThread().setContextClassLoader(loader);
- }
- } }
+ getExecutor().execute(new SocketEventProcessor(wrapper, status));
} catch (RejectedExecutionException x) {
log.warn("Socket processing request was rejected for:"+socket,x);
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
