diff --git a/src/main/java/org/apache/catalina/servlets/ManagerServlet.java b/src/main/java/org/apache/catalina/servlets/ManagerServlet.java
index 2a23dfe..3c6f0c9 100644
--- a/src/main/java/org/apache/catalina/servlets/ManagerServlet.java
+++ b/src/main/java/org/apache/catalina/servlets/ManagerServlet.java
@@ -1102,7 +1102,6 @@ protected void undeploy(PrintWriter writer, String path) {
             // Identify the appBase of the owning Host of this Context (if any)
             String appBase = null;
             File appBaseDir = null;
-            String appBasePath = null;
             if (context.getParent() instanceof Host) {
                 appBase = ((Host) context.getParent()).getAppBase();
                 appBaseDir = new File(appBase);
@@ -1110,7 +1109,6 @@ protected void undeploy(PrintWriter writer, String path) {
                     appBaseDir = new File(System.getProperty("catalina.base"),
                                           appBase);
                 }
-                appBasePath = appBaseDir.getCanonicalPath();
             }
 
             // Validate the docBase path of this application
@@ -1121,7 +1119,7 @@ protected void undeploy(PrintWriter writer, String path) {
                 docBaseDir = new File(appBaseDir, docBase);
             }
             String docBasePath = docBaseDir.getCanonicalPath();
-            if (!docBasePath.startsWith(deployedPath)) {
+            if (!docBaseDir.getCanonicalFile().toPath().startsWith(deployedPath)) {
                 writer.println(sm.getString("managerServlet.noDocBase",
                                             displayPath));
                 return;