remm 2004/12/16 07:39:28
Modified: webapps/manager/WEB-INF/classes/org/apache/catalina/manager
ManagerServlet.java
Log:
- 32729: stop is optional and may fail, so it needs to be in a separate
try/catch.
Revision Changes Path
1.24 +6 -2
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
Index: ManagerServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ManagerServlet.java 3 Dec 2004 15:35:25 -0000 1.23
+++ ManagerServlet.java 16 Dec 2004 15:39:28 -0000 1.24
@@ -1317,11 +1317,15 @@
}
}
- // Stop the context first to be nicer
if (!isServiced(path)) {
addServiced(path);
try {
+ // Try to stop the context first to be nicer
((Lifecycle) context).stop();
+ } catch (Throwable t) {
+ // Ignore
+ }
+ try {
File war = new File(getAppBase(), getDocBase(path) +
".war");
File dir = new File(getAppBase(), getDocBase(path));
File xml = new File(configBase, getConfigFile(path) +
".xml");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
