Skip to content

fix: resolve double-slash path in FileResolverImpl when fileName is root #6281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
waterWang wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −7
Open

fix: resolve double-slash path in FileResolverImpl when fileName is root #6281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions vertx-core/src/main/java/io/vertx/core/file/impl/FileResolverImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ private File unpackFromFileURL(URL url, String fileName, ClassLoader cl) {
String[] listing = resource.list();
if (listing != null) {
for (String file : listing) {
String subResource = fileName + "/" + file;
String subResource = fileName + (fileName.endsWith("/") ? "" : "/") + file;
URL url2 = getValidClassLoaderResource(cl, subResource);
unpackFromFileURL(url2, subResource, cl);
}
Expand Down Expand Up @@ -410,12 +410,12 @@ private boolean isBundleUrlDirectory(URL url) {
/**
* bundle:// urls are used by OSGi implementations to refer to a file contained in a bundle, or in a fragment. There
* is not much we can do to get the file from it, except reading it from the url. This method copies the files by
* reading it from the url.
*
* @param url the url
* @param fileName the file name used to cache the content
* @return the extracted file
*/
* reading it from the url.
*
* @param url the url
* @param fileName the file name used to cache the content
* @return the extracted file
*/
private File unpackFromBundleURL(URL url, String fileName, boolean isDir) {
try {
if ((getClassLoader() != null && isBundleUrlDirectory(url)) || isDir) {
Expand Down