Author: markt Date: Sun Sep 26 22:22:25 2010 New Revision: 1001538 URL: http://svn.apache.org/viewvc?rev=1001538&view=rev Log: Better Javadoc. If endpoint is shutting down, return false so connection to client is closed immediately.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=1001538&r1=1001537&r2=1001538&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Sun Sep 26 22:22:25 2010 @@ -490,7 +490,17 @@ public class JIoEndpoint extends Abstrac /** - * Process given socket. + * Process a new connection from a new client. Wraps the socket so + * keep-alive and other attributes can be tracked and then passes the socket + * to the executor for processing. + * + * @param socket The socket associated with the client. + * + * @return <code>true</code> if the socket is passed to the + * executor, <code>false</code> if something went wrong or + * if the endpoint is shutting down. Returning + * <code>false</code> is an indication to close the socket + * immediately. */ protected boolean processSocket(Socket socket) { // Process the request from this socket @@ -500,7 +510,9 @@ public class JIoEndpoint extends Abstrac // During shutdown, executor may be null - avoid NPE if (running) { getExecutor().execute(new SocketProcessor(wrapper)); + return true; } + return false; } catch (RejectedExecutionException x) { log.warn("Socket processing request was rejected for:"+socket,x); return false; @@ -510,7 +522,6 @@ public class JIoEndpoint extends Abstrac log.error(sm.getString("endpoint.process.fail"), t); return false; } - return true; } public boolean processSocket(SocketWrapper<Socket> socket, SocketStatus status) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org