2014-07-09 2:08 GMT+04:00 <ma...@apache.org>:
> Author: markt
> Date: Tue Jul 8 22:08:26 2014
> New Revision: 1608963
>
> URL: http://svn.apache.org/r1608963
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56684
> Add a workaround for a bug that should never happen along with some basic
> debug logging.
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
> tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
> tomcat/trunk/webapps/docs/changelog.xml
>
> --- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Tue Jul 8
> 22:08:26 2014
> @@ -24,6 +24,7 @@ import java.io.InputStream;
> import java.net.InetAddress;
> import java.net.ServerSocket;
> import java.net.Socket;
> +import java.net.SocketTimeoutException;
> import java.net.URISyntaxException;
> import java.net.URL;
> import java.net.URLClassLoader;
> @@ -440,10 +441,18 @@ public final class StandardServer extend
> StringBuilder command = new StringBuilder();
> try {
> InputStream stream;
> + long acceptStartTime = System.currentTimeMillis();
> try {
> + serverSocket.setSoTimeout(5000);
I think the above line is a leftover from testing the log message.
> socket = serverSocket.accept();
> socket.setSoTimeout(10 * 1000); // Ten seconds
> stream = socket.getInputStream();
> + } catch (SocketTimeoutException ste) {
> + // This should never happen but bug 56684 suggests
> that
> + // it does.
> +
> log.warn(sm.getString("standardServer.accept.timeout",
> + Long.valueOf(System.currentTimeMillis() -
> acceptStartTime)), ste);
> + continue;
> } catch (AccessControlException ace) {
> log.warn("StandardServer.accept security exception: "
> + ace.getMessage(), ace);
>
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
