From 46fe24c8499ca269213ccab5aa64edc460b92cea Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 25 Nov 2010 10:19:33 +0000
Subject: [PATCH] Correctly validate context path so sessions can be viewed for
 ROOT webapp

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1038981 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/manager/HTMLManagerServlet.java | 4 ++--
 webapps/docs/changelog.xml                               | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java b/java/org/apache/catalina/manager/HTMLManagerServlet.java
index d25d10659..187426c7c 100644
--- a/java/org/apache/catalina/manager/HTMLManagerServlet.java
+++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java
@@ -868,7 +868,7 @@ public final class HTMLManagerServlet extends ManagerServlet {
 
     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 extends ManagerServlet {
     }
     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) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 44b4657eb..954e0f8f0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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">
-- 
2.11.0