Fixed url to file conversion breaking paths with spaces #25448
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pzygielo
reviewed
Apr 10, 2025
| .map(File::new) | ||
| .map(File::getAbsolutePath) | ||
| .collect(Collectors.joining(File.pathSeparator)); | ||
| return urls.map(FileUtils::toFile).map(File::getAbsolutePath).collect(Collectors.joining(File.pathSeparator)); |
There was a problem hiding this comment.
I'd keep original line breaks to show that only part of the method changed, not the whole one.
There was a problem hiding this comment.
It is under 120 characters border, so it is not so hard to read. I would agree otherwise.
OndroMih
reviewed
Apr 10, 2025
nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/FileUtils.java
Outdated
Show resolved
Hide resolved
...eus/core/kernel/src/main/java/com/sun/enterprise/v3/server/CommonClassLoaderServiceImpl.java
Show resolved
Hide resolved
- This conversion is used very often and I got tired of all issues with that. Signed-off-by: David Matějček <[email protected]>
Signed-off-by: David Matějček <[email protected]>
- Added coverage of paths with spaces - Added coverage of adding an empty file path Signed-off-by: David Matějček <[email protected]>
- Original code broke when path contained spaces
- Added validation of the path before it was added anywhere.
- Note that FileUtils.toFile throws IAE when the path is empty too, however
this code is now probably unreachable because of the validation.
Signed-off-by: David Matějček <[email protected]>
dmatej
changed the title
OndroMih
approved these changes
Apr 11, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes part of issues seen when manually testing another branch on Windows using path with spaces.
Fixes also a validation issue when URL with empty path could pass into the classloader.
I have cherrypicked also another commit refactoring test which I needed here to confirm issues we have noticed in sources.