craigmcc 02/01/31 13:20:00
Modified: catalina/src/share/org/apache/catalina/connector/http Tag:
tomcat_40_branch HttpConnector.java
catalina/src/share/org/apache/catalina/core Tag:
tomcat_40_branch StandardServer.java
Log:
Port enhancement to "address already in use" exceptions so show the
port number (and optional IP address).
Revision Changes Path
No revision
No revision
1.24.2.1 +16 -6
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.24
retrieving revision 1.24.2.1
diff -u -r1.24 -r1.24.2.1
--- HttpConnector.java 11 Sep 2001 17:33:02 -0000 1.24
+++ HttpConnector.java 31 Jan 2002 21:19:59 -0000 1.24.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
1.24 2001/09/11 17:33:02 craigmcc Exp $
- * $Revision: 1.24 $
- * $Date: 2001/09/11 17:33:02 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
1.24.2.1 2002/01/31 21:19:59 craigmcc Exp $
+ * $Revision: 1.24.2.1 $
+ * $Date: 2002/01/31 21:19:59 $
*
* ====================================================================
*
@@ -66,6 +66,7 @@
import java.io.IOException;
+import java.net.BindException;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
@@ -96,7 +97,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.24 $ $Date: 2001/09/11 17:33:02 $
+ * @version $Revision: 1.24.2.1 $ $Date: 2002/01/31 21:19:59 $
*/
@@ -943,14 +944,23 @@
// If no address is specified, open a connection on all addresses
if (address == null) {
log(sm.getString("httpConnector.allAddresses"));
- return (factory.createSocket(port, acceptCount));
+ try {
+ return (factory.createSocket(port, acceptCount));
+ } catch (BindException be) {
+ throw new BindException(be.getMessage() + ":" + port);
+ }
}
// Open a server socket on the specified address
try {
InetAddress is = InetAddress.getByName(address);
log(sm.getString("httpConnector.anAddress", address));
- return (factory.createSocket(port, acceptCount, is));
+ try {
+ return (factory.createSocket(port, acceptCount, is));
+ } catch (BindException be) {
+ throw new BindException(be.getMessage() + ":" + address
+ + ":" + port);
+ }
} catch (Exception e) {
log(sm.getString("httpConnector.noAddress", address));
return (factory.createSocket(port, acceptCount));
No revision
No revision
1.12.2.1 +6 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- StandardServer.java 4 Sep 2001 19:19:48 -0000 1.12
+++ StandardServer.java 31 Jan 2002 21:19:59 -0000 1.12.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
1.12 2001/09/04 19:19:48 craigmcc Exp $
- * $Revision: 1.12 $
- * $Date: 2001/09/04 19:19:48 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
1.12.2.1 2002/01/31 21:19:59 craigmcc Exp $
+ * $Revision: 1.12.2.1 $
+ * $Date: 2002/01/31 21:19:59 $
*
* ====================================================================
*
@@ -89,7 +89,7 @@
* (but not required) when deploying and starting Catalina.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.12 $ $Date: 2001/09/04 19:19:48 $
+ * @version $Revision: 1.12.2.1 $ $Date: 2002/01/31 21:19:59 $
*/
public final class StandardServer
@@ -277,7 +277,8 @@
new ServerSocket(port, 1,
InetAddress.getByName("127.0.0.1"));
} catch (IOException e) {
- System.err.println("StandardServer.await: create: " + e);
+ System.err.println("StandardServer.await: create[" + port
+ + "]: " + e);
e.printStackTrace();
System.exit(1);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
