Remove unnecessary code

markt-asf · markt-asf · commit 3c3fabe84c44 · 2021-01-19T16:55:46.000Z
canRead() is true so the directory exists.
If the directory exists File.toURI().toURL() will always end in a
trailing "/".
diff --git a/java/org/apache/catalina/startup/ClassLoaderFactory.java b/java/org/apache/catalina/startup/ClassLoaderFactory.java
@@ -89,7 +89,7 @@ public static ClassLoader createClassLoader(File unpacked[],
                 if (!file.canRead()) {
                     continue;
                 }
-                file = new File(file.getCanonicalPath() + File.separator);
+                file = new File(file.getCanonicalPath());
                 URL url = file.toURI().toURL();
                 if (log.isDebugEnabled()) {
                     log.debug("  Including directory " + url);

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public static ClassLoader createClassLoader(File unpacked[],`
`89`	`89`	`if (!file.canRead()) {`
`90`	`90`	`continue;`
`91`	`91`	`}`
`92`		`- file = new File(file.getCanonicalPath() + File.separator);`
	`92`	`+ file = new File(file.getCanonicalPath());`
`93`	`93`	`URL url = file.toURI().toURL();`
`94`	`94`	`if (log.isDebugEnabled()) {`
`95`	`95`	`log.debug(" Including directory " + url);`