seguin 02/01/09 18:53:40
Modified: jk/java/org/apache/ajp/tomcat4 Ajp13Connector.java
Log:
if the connector has been stopped, don't reopen server socket when
an IOException is thrown.
Revision Changes Path
1.11 +18 -6
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Connector.java
Index: Ajp13Connector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Connector.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Ajp13Connector.java 20 Dec 2001 17:44:51 -0000 1.10
+++ Ajp13Connector.java 10 Jan 2002 02:53:40 -0000 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Connector.java,v
1.10 2001/12/20 17:44:51 jfclere Exp $
- * $Revision: 1.10 $
- * $Date: 2001/12/20 17:44:51 $
+ * $Header:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Connector.java,v
1.11 2002/01/10 02:53:40 seguin Exp $
+ * $Revision: 1.11 $
+ * $Date: 2002/01/10 02:53:40 $
*
* ====================================================================
*
@@ -93,7 +93,7 @@
* Implementation of an Ajp13 connector.
*
* @author Kevin Seguin
- * @version $Revision: 1.10 $ $Date: 2001/12/20 17:44:51 $
+ * @version $Revision: 1.11 $ $Date: 2002/01/10 02:53:40 $
*/
@@ -788,7 +788,8 @@
socket.setSoTimeout(connectionTimeout);
}
} catch (AccessControlException ace) {
- logger.log("socket accept security exception: " + ace.getMessage());
+ logger.log("socket accept security exception: "
+ + ace.getMessage());
continue;
} catch (IOException e) {
if (started && !stopped)
@@ -797,7 +798,18 @@
if (serverSocket != null) {
serverSocket.close();
}
- serverSocket = open();
+ if (stopped) {
+ if (debug > 0) {
+ logger.log("run(): stopped, so breaking");
+ }
+ break;
+ } else {
+ if (debug > 0) {
+ logger.log("run(): not stopped, " +
+ "so reopening server socket");
+ }
+ serverSocket = open();
+ }
} catch (IOException ex) {
// If reopening fails, exit
logger.log("socket reopen: ", ex);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
