remm 2003/07/25 09:41:46
Modified: webapps/manager/WEB-INF/classes/org/apache/catalina/manager
HTMLManagerServlet.java
Log:
- Fix regression: error message when deploying a webapp which doesn't have
a META-INF/context.xml (oops).
Revision Changes Path
1.6 +8 -6
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
Index: HTMLManagerServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HTMLManagerServlet.java 25 Jul 2003 16:01:37 -0000 1.5
+++ HTMLManagerServlet.java 25 Jul 2003 16:41:46 -0000 1.6
@@ -294,8 +294,10 @@
}
String config = null;
try {
- URL url = localXml.toURL();
- config = url.toString();
+ if (localXml.exists()) {
+ URL url = localXml.toURL();
+ config = url.toString();
+ }
} catch (MalformedURLException e) {
throw e;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
