tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net AprEndpoint.java
Date Fri, 15 Jul 2005 15:40:00 GMT
remm        2005/07/15 08:40:00

  Modified:    util/java/org/apache/tomcat/util/net/res
                        LocalStrings.properties
               util/java/org/apache/tomcat/util/net AprEndpoint.java
  Log:
  - Some localization.
  
  Revision  Changes    Path
  1.11      +2 -0      jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/res/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/res/LocalStrings.properties,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- LocalStrings.properties	14 Jun 2005 13:14:18 -0000	1.10
  +++ LocalStrings.properties	15 Jul 2005 15:39:59 -0000	1.11
  @@ -11,6 +11,8 @@
   endpoint.debug.unlock=Caught exception trying to unlock accept on port {0}
   endpoint.err.close=Caught exception trying to close socket
   endpoint.noProcessor=No Processors - worker thread dead!
  +endpoint.init.bind=Socket bind failed: {0}
  +endpoint.init.listen=Socket listen failed: {0}
   
   endpoint.accept.fail=Socket accept failed
   endpoint.poll.limitedpollsize=Failed to create poller with specified size, uses 62 instead
  
  
  
  1.65      +7 -4      jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- AprEndpoint.java	14 Jul 2005 22:35:21 -0000	1.64
  +++ AprEndpoint.java	15 Jul 2005 15:40:00 -0000	1.65
  @@ -16,6 +16,7 @@
   
   package org.apache.tomcat.util.net;
   
  +import java.io.IOException;
   import java.net.InetAddress;
   import java.util.ArrayList;
   import java.util.HashMap;
  @@ -512,12 +513,14 @@
                   Socket.APR_PROTO_TCP, rootPool);
           // Bind the server socket
           int ret = Socket.bind(serverSock, inetAddress);
  -        if (ret != 0)
  -          throw(new Exception("bind failed: " + ret));
  +        if (ret != 0) {
  +            throw new Exception(sm.getString("endpoint.init.bind", "" + ret));
  +        }
           // Start listening on the server socket
           ret = Socket.listen(serverSock, backlog);
  -        if (ret != 0)
  -          throw(new Exception("listen failed: " + ret));
  +        if (ret != 0) {
  +            throw new Exception(sm.getString("endpoint.init.listen", "" + ret));
  +        }
   
           // Sendfile usage on systems which don't support it cause major problems
           if (useSendfile && !Library.APR_HAS_SENDFILE) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message