larryi 02/02/23 19:39:58
Modified: src/share/org/apache/tomcat/startup EmbededTomcat.java
Log:
If using server.xml, verify that some interceptors were added. If not,
don't start since modules.xml or server.xml are likely missing.
Revision Changes Path
1.64 +13 -2
jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java
Index: EmbededTomcat.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- EmbededTomcat.java 11 Jan 2002 07:24:17 -0000 1.63
+++ EmbededTomcat.java 24 Feb 2002 03:39:58 -0000 1.64
@@ -552,6 +552,15 @@
contextM.addInterceptor( (BaseInterceptor)
modules.elementAt( i ) );
}
+
+ // if using server.xml and no new interceptors found, then quit
+ if( serverXml && (modules.size() ==
+ contextM.getContainer().getInterceptors().length)) {
+ debug("No configuration found.");
+ debug("The modules and/or server configuration files are missing.");
+ return;
+ }
+
contextM.init();
} catch( Throwable ex ) {
if( ex instanceof InvocationTargetException ) {
@@ -696,8 +705,10 @@
debug("Init time " + (time2-time1));
}
- // Start
- start();
+ if( initialized ) {
+ // Start
+ start();
+ }
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
