You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@apache.org on 2002/02/01 00:13:26 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpConnector.java

craigmcc    02/01/31 15:13:26

  Modified:    catalina/src/share/org/apache/catalina/connector/http
                        HttpConnector.java
  Log:
  Jon's eagle eyes saw a createSocket call that I had failed to catch.
  
  Revision  Changes    Path
  1.31      +9 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java
  
  Index: HttpConnector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- HttpConnector.java	31 Jan 2002 20:56:03 -0000	1.30
  +++ HttpConnector.java	31 Jan 2002 23:13:26 -0000	1.31
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v 1.30 2002/01/31 20:56:03 craigmcc Exp $
  - * $Revision: 1.30 $
  - * $Date: 2002/01/31 20:56:03 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v 1.31 2002/01/31 23:13:26 craigmcc Exp $
  + * $Revision: 1.31 $
  + * $Date: 2002/01/31 23:13:26 $
    *
    * ====================================================================
    *
  @@ -103,7 +103,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.30 $ $Date: 2002/01/31 20:56:03 $
  + * @version $Revision: 1.31 $ $Date: 2002/01/31 23:13:26 $
    */
   
   
  @@ -992,7 +992,11 @@
               }
           } catch (Exception e) {
               log(sm.getString("httpConnector.noAddress", address));
  -            return (factory.createSocket(port, acceptCount));
  +            try {
  +                return (factory.createSocket(port, acceptCount));
  +            } catch (BindException be) {
  +                throw new BindException(be.getMessage() + ":" + port);
  +            }
           }
   
       }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>