craigmcc 01/01/02 18:20:46
Modified: catalina/src/share/org/apache/catalina/servlets
ManagerServlet.java
Log:
Support management of the ROOT web application (i.e. the one mapped to an
empty string as the context path).
Revision Changes Path
1.3 +10 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java
Index: ManagerServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ManagerServlet.java 2000/10/05 02:30:22 1.2
+++ ManagerServlet.java 2001/01/03 02:20:46 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
1.2 2000/10/05 02:30:22 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2000/10/05 02:30:22 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
1.3 2001/01/03 02:20:46 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/01/03 02:20:46 $
*
* ====================================================================
*
@@ -123,7 +123,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2000/10/05 02:30:22 $
+ * @version $Revision: 1.3 $ $Date: 2001/01/03 02:20:46 $
*/
public final class ManagerServlet
@@ -273,7 +273,8 @@
log("deploy: Deploying web application at '" + path +
"' from '" + war + "'");
- if ((path == null) || !path.startsWith("/")) {
+ if ((path == null) ||
+ (!path.startsWith("/") && !path.equals(""))) {
writer.println(sm.getString("managerServlet.invalidPath", path));
return;
}
@@ -332,7 +333,8 @@
if (debug >= 1)
log("restart: Reloading web application at '" + path + "'");
- if ((path == null) || !path.startsWith("/")) {
+ if ((path == null) ||
+ (!path.startsWith("/") && !path.equals(""))) {
writer.println(sm.getString("managerServlet.invalidPath", path));
return;
}
@@ -365,7 +367,8 @@
if (debug >= 1)
log("undeploy: Undeploying web application at '" + path + "'");
- if ((path == null) || !path.startsWith("/")) {
+ if ((path == null) ||
+ (!path.startsWith("/") && !path.equals(""))) {
writer.println(sm.getString("managerServlet.invalidPath", path));
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
