Return-Path: Mailing-List: contact rpc-dev-help@xml.apache.org; run by ezmlm Delivered-To: mailing list rpc-dev@xml.apache.org Delivered-To: moderator for rpc-dev@xml.apache.org Received: (qmail 17079 invoked by uid 500); 11 Aug 2001 10:18:20 -0000 Delivered-To: apmail-xml-rpc-cvs@apache.org Received: (qmail 17076 invoked from network); 11 Aug 2001 10:18:20 -0000 Received: from h32.sny.collab.net (HELO icarus.apache.org) (64.208.42.42) by h31.sny.collab.net with SMTP; 11 Aug 2001 10:18:20 -0000 Received: (qmail 53738 invoked by uid 1164); 11 Aug 2001 10:15:52 -0000 Date: 11 Aug 2001 10:15:52 -0000 Message-ID: <20010811101552.53736.qmail@icarus.apache.org> From: dlr@apache.org To: xml-rpc-cvs@apache.org Subject: cvs commit: xml-rpc/src/java/org/apache/xmlrpc/secure SecureWebServer.java X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N dlr 01/08/11 03:15:52 Modified: src/java/org/apache/xmlrpc/secure SecureWebServer.java Log: Override WebServer's createServerSocket() hook method. setupServerSocket() is responsible for setting socket timeout, so we don't want to override that method. setupServerSocket() should probably be private in WebServer, or final (though I don't see any reason for it to remain public). I vote for deprecating it, then inlining its code. Revision Changes Path 1.2 +6 -3 xml-rpc/src/java/org/apache/xmlrpc/secure/SecureWebServer.java Index: SecureWebServer.java =================================================================== RCS file: /home/cvs/xml-rpc/src/java/org/apache/xmlrpc/secure/SecureWebServer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -u -r1.1 -r1.2 --- SecureWebServer.java 2001/07/20 19:38:19 1.1 +++ SecureWebServer.java 2001/08/11 10:15:52 1.2 @@ -83,7 +83,7 @@ * values before anything will work. * * @author Jason van Zyl - * @version $Id: SecureWebServer.java,v 1.1 2001/07/20 19:38:19 jvanzyl Exp $ + * @version $Id: SecureWebServer.java,v 1.2 2001/08/11 10:15:52 dlr Exp $ */ public class SecureWebServer extends WebServer @@ -111,7 +111,10 @@ super(port,add); } - public void setupServerSocket(int port, int backlog, InetAddress add) + /** + * @see org.apache.xmlrpc.WebServer#createServerSocket(int port, int backlog, InetAddress add) + */ + protected ServerSocket createServerSocket(int port, int backlog, InetAddress add) throws Exception { SecurityTool.setup(); @@ -130,7 +133,7 @@ context.init(keyManagerFactory.getKeyManagers(), null, null); SSLServerSocketFactory sslSrvFact = context.getServerSocketFactory(); - serverSocket = (SSLServerSocket) sslSrvFact.createServerSocket(port); + return (SSLServerSocket) sslSrvFact.createServerSocket(port); } /**