Author: markt
Date: Thu Nov 25 10:19:33 2010
New Revision: 1038981
URL: http://svn.apache.org/viewvc?rev=1038981&view=rev
Log:
Correctly validate context path so sessions can be viewed for ROOT webapp
Modified:
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1038981&r1=1038980&r2=1038981&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Thu
Nov 25 10:19:33 2010
@@ -868,7 +868,7 @@ public final class HTMLManagerServlet ex
protected List<Session> getSessionsForName(ContextName cn,
StringManager smClient) {
- if ((cn == null) || (!cn.getPath().startsWith("/") &&
+ if ((cn == null) || !(cn.getPath().startsWith("/") ||
cn.getPath().equals(""))) {
String path = null;
if (cn != null) {
@@ -905,7 +905,7 @@ public final class HTMLManagerServlet ex
}
protected Session getSessionForNameAndId(ContextName cn, String id,
StringManager smClient) throws IOException {
- if ((cn == null) || (!cn.getPath().startsWith("/") &&
+ if ((cn == null) || !(cn.getPath().startsWith("/") ||
cn.getPath().equals(""))) {
String path = null;
if (cn != null) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1038981&r1=1038980&r2=1038981&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Nov 25 10:19:33 2010
@@ -78,6 +78,10 @@
<bug>50294</bug>: Add more information to documentation regarding
format
of configuration files. Patch provided by Luke Meyer. (markt)
</add>
+ <fix>
+ Correct validate provided context path so sessions for the ROOT web
+ application can be viewed through the HTML Manager. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
