Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 81688 invoked from network); 1 Jan 2003 13:55:33 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 1 Jan 2003 13:55:33 -0000 Received: (qmail 19318 invoked by uid 97); 1 Jan 2003 13:56:42 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 19271 invoked by uid 97); 1 Jan 2003 13:56:41 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 19251 invoked by uid 97); 1 Jan 2003 13:56:40 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Date: 1 Jan 2003 13:55:22 -0000 Message-ID: <20030101135522.19882.qmail@icarus.apache.org> From: remm@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N remm 2003/01/01 05:55:22 Modified: util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java Log: - Don't check for null on the connection (it should never be null, and should be caught by the throwable and logged if it happens). - Fix a problem when using SSL: when an exception occurs during the handshake, if continue is used, the thread will immediately start to listen on the socket, for no good reason. I found that patch on tomcat-user, alledgedly submitted by Xiaojian Wang (I couldn't find the original message), and reposted by Carl Zetterberg. Revision Changes Path 1.11 +5 -7 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java Index: PoolTcpEndpoint.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- PoolTcpEndpoint.java 19 Dec 2002 15:55:45 -0000 1.10 +++ PoolTcpEndpoint.java 1 Jan 2003 13:55:22 -0000 1.11 @@ -519,12 +519,12 @@ endpoint.getServerSocketFactory().handshake(s); } } catch (Throwable t) { - endpoint.log.info("Handshake failed", t); + endpoint.log.debug("Handshake failed", t); // Try to close the socket try { s.close(); } catch (IOException e) {} - continue; + break; } TcpConnection con = null; @@ -536,8 +536,6 @@ } else { con = (TcpConnection) perThrData[0]; perThrData = (Object []) perThrData[1]; - if ( con == null ) - continue; } con.setEndpoint(endpoint); -- To unsubscribe, e-mail: For additional commands, e-mail: