You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2003/05/21 02:54:34 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Catalina.java
jfarcand 2003/05/20 17:54:34
Modified: catalina/src/share/org/apache/catalina/startup Catalina.java
Log:
Unify the way we shutdown the server. Fix a classloading problem when the digester file are under common/lin instead of server/lib.
Revision Changes Path
1.17 +7 -14 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
Index: Catalina.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Catalina.java 29 Apr 2003 22:40:52 -0000 1.16
+++ Catalina.java 21 May 2003 00:54:34 -0000 1.17
@@ -411,6 +411,7 @@
// Create and execute our Digester
Digester digester = createStopDigester();
+ digester.setClassLoader(Thread.currentThread().getContextClassLoader());
File file = configFile();
try {
InputSource is =
@@ -658,21 +659,13 @@
public void run() {
if (server != null) {
- try {
- ((Lifecycle) server).stop();
- } catch (LifecycleException e) {
- System.out.println("Catalina.stop: " + e);
- e.printStackTrace(System.out);
- if (e.getThrowable() != null) {
- System.out.println("----- Root Cause -----");
- e.getThrowable().printStackTrace(System.out);
- }
- }
+ this.stop();
}
}
}
+
private static org.apache.commons.logging.Log log=
org.apache.commons.logging.LogFactory.getLog( Catalina.class );
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org