You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@apache.org on 2001/07/25 00:48:32 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Embedded.java
pier 01/07/24 15:48:32
Modified: catalina/src/share/org/apache/catalina/startup Embedded.java
Log:
Updated the Embedded server to pick up the changes in the modifications
we made during the weekend.
Now also Embedded calls initialize() in the Connector interface at the
right times, and binds appropriately to the configured port.
Revision Changes Path
1.10 +10 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Embedded.java 2001/07/22 20:25:13 1.9
+++ Embedded.java 2001/07/24 22:48:31 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v 1.9 2001/07/22 20:25:13 pier Exp $
- * $Revision: 1.9 $
- * $Date: 2001/07/22 20:25:13 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v 1.10 2001/07/24 22:48:31 pier Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/07/24 22:48:31 $
*
* ====================================================================
*
@@ -148,7 +148,7 @@
* </pre>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.9 $ $Date: 2001/07/22 20:25:13 $
+ * @version $Revision: 1.10 $ $Date: 2001/07/24 22:48:31 $
*/
public class Embedded implements Lifecycle {
@@ -431,9 +431,12 @@
connectors = results;
// Start this Connector if necessary
- if (started && (connector instanceof Lifecycle)) {
+ if (started) {
try {
- ((Lifecycle) connector).start();
+ connector.initialize();
+ if (connector instanceof Lifecycle) {
+ ((Lifecycle) connector).start();
+ }
} catch (LifecycleException e) {
logger.log("Connector.start", e);
}
@@ -939,6 +942,7 @@
// Start our defined Connectors second
for (int i = 0; i < connectors.length; i++) {
+ connectors[i].initialize();
if (connectors[i] instanceof Lifecycle)
((Lifecycle) connectors[i]).start();
}