-
Notifications
You must be signed in to change notification settings - Fork 6.1k
8362429: AssertionError in File.listFiles(FileFilter | FilenameFilter) #26353
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.
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
Conversation
👋 Welcome back bpb! A progress list of the required criteria for merging this PR into |
@bplb This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 4 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
Webrevs
|
for (String s : ss) { | ||
File f = new File(s, this); | ||
if ((filter == null) || filter.accept(f)) | ||
files.add(f); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rather than duplicating the loop, it could be changed to introduce boolean isEmpty = path.isEmpty
and then the f
can be created with File f = isEmpty ? new File(s) : new File(this, s);
It should be a bit cleaner.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had rejected that in the case of the parameter-less listFiles
to avoid a ternary operator in each loop iteration but it is cleaner. Will update.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So changed in cfd494f.
public void listFilesFilenameFilter() throws IOException { | ||
listFiles(x -> x.listFiles((FilenameFilter)null)); | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What would you think about test a non-null filter too?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What would you think about test a non-null filter too?
Okay.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add listFiles
tests for non-null FileFilter
and FilenameFilter
in cfd494f.
/integrate |
Going to push as commit be0161a.
Your commit was automatically rebased without conflicts. |
/backport :jdk25 |
@bplb the backport was successfully created on the branch backport-bplb-be0161a8-jdk25 in my personal fork of openjdk/jdk. To create a pull request with this backport targeting openjdk/jdk:jdk25, just click the following link: The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk:
|
Address the same problem as in #26224 but for the
listFiles
variants with a filter parameter.Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26353/head:pull/26353
$ git checkout pull/26353
Update a local copy of the PR:
$ git checkout pull/26353
$ git pull https://git.openjdk.org/jdk.git pull/26353/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 26353
View PR using the GUI difftool:
$ git pr show -t 26353
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26353.diff
Using Webrev
Link to Webrev Comment