You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2006/09/06 13:10:55 UTC
svn commit: r440687 -
/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: remm
Date: Wed Sep 6 04:10:54 2006
New Revision: 440687
URL: http://svn.apache.org/viewvc?view=rev&rev=440687
Log:
- Oops, the order of evaluation is most likely wrong (accept needs to be done first, since it may throw an Error)
compared to the TC 6 branch.
Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java?view=diff&rev=440687&r1=440686&r2=440687
==============================================================================
--- tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Sep 6 04:10:54 2006
@@ -997,10 +997,11 @@
}
try {
- // Allocate a new worker thread
// Accept the next incoming connection from the server socket
+ long socket = Socket.accept(serverSock);
+ // Allocate a new worker thread
// Hand this socket off to an appropriate processor
- getWorkerThread().assign(Socket.accept(serverSock), true);
+ getWorkerThread().assign(socket, true);
} catch (Throwable t) {
log.error(sm.getString("endpoint.accept.fail"), t);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org