billbarker 02/01/30 19:38:29
Modified: src/admin/WEB-INF/classes/tadm TomcatAdmin.java
src/admin/contextAdmin contextAdmin.html
Log:
Fix the remove-context feature of the admin webapp.
Allowing users to leave off the leading "/", and (more importantly) making sure that
we really do have a match before removing.
Fix for Bug #6137
Reported by: Johannes Lehtinen [EMAIL PROTECTED]
Revision Changes Path
1.13 +8 -2 jakarta-tomcat/src/admin/WEB-INF/classes/tadm/TomcatAdmin.java
Index: TomcatAdmin.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/TomcatAdmin.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TomcatAdmin.java 23 Mar 2001 02:14:16 -0000 1.12
+++ TomcatAdmin.java 31 Jan 2002 03:38:28 -0000 1.13
@@ -45,21 +45,27 @@
if( docBase==null && docBaseParam!=null) {
docBase=req.getParameter( docBaseParam );
}
-
+
+ boolean found = false;
if( ctxPath != null ) {
System.out.println("Finding " + ctxPath );
+ if( ! ctxPath.startsWith("/") )
+ ctxPath = "/" + ctxPath;
+ if( ctxPath.equals("/") )
+ ctxPath="";
Enumeration en=cm.getContexts();
while( en.hasMoreElements() ) {
ctx=(Context)en.nextElement();
// XXX virtual host
if( ctxPath.equals( ctx.getPath())) {
+ found=true;
pageContext.setAttribute("ctx", ctx);
System.out.println("Found " + ctx );
break;
}
}
}
- if("removeContext".equals( action ) )
+ if("removeContext".equals( action ) && found)
removeContext( cm , ctx);
if("setLogger".equals( action ) )
setLogFile( ctx, value );
1.3 +1 -1 jakarta-tomcat/src/admin/contextAdmin/contextAdmin.html
Index: contextAdmin.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextAdmin.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- contextAdmin.html 27 Dec 2000 21:41:31 -0000 1.2
+++ contextAdmin.html 31 Jan 2002 03:38:29 -0000 1.3
@@ -55,8 +55,8 @@
<tr>
<form type=POST action=contextRemove.jsp>
<td><td><INPUT TYPE=submit name="submit" value="Remove Context">
- <td><td><INPUT TYPE=text name="virtualHost" size=20>
<td><td><INPUT TYPE=text name="removeContextName" size=20>
+ <td><td><INPUT TYPE=text name="virtualHost" size=20>
</form>
</tr>
</table>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
