Skip to content
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

Jump to bottom

Fix StandardConfigDataLocationResolver.resolvePatternEmptyDirectories() #26677

Closed
wants to merge 1 commit into from
Closed

Fix StandardConfigDataLocationResolver.resolvePatternEmptyDirectories() #26677

wants to merge 1 commit into from

Conversation

izeye
Copy link
Contributor

@izeye izeye commented May 27, 2021

This PR fixes StandardConfigDataLocationResolver.resolvePatternEmptyDirectories() by adding a missing negation as it seems to have been missed accidentally.

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label May 27, 2021
@philwebb
Copy link
Member

Oh wow. Good spot! I totally messed up Andy's work in #26627

@philwebb philwebb added type: regression A regression from a previous release and removed status: waiting-for-triage An issue we've not yet triaged labels May 27, 2021
@philwebb philwebb added this to the 2.4.x milestone May 27, 2021
@philwebb philwebb added type: task A general task and removed type: regression A regression from a previous release labels May 27, 2021
@philwebb philwebb mentioned this pull request May 27, 2021
Closed
philwebb pushed a commit that referenced this pull request May 27, 2021
@izeye @philwebb
Fix "Allow optional directories without sub-directories"
38b9a83 
Fix the update to `resolvePatternEmptyDirectories` introduced in
commit 01dd68e which was incorrectly checking `isOptional`.

See gh-26677
philwebb added a commit that referenced this pull request May 27, 2021
@philwebb
Test optional directories without sub-directories
3f858ed 
Add an additional test to ensure that optional wildcard
directory patterns do not fail.

See gh-26677
@philwebb philwebb closed this in 35f1194 May 27, 2021
@philwebb
Copy link
Member

Thanks so much @izeye. You saved me from myself once again!

@philwebb philwebb modified the milestones: 2.4.x, 2.4.7 May 27, 2021
@izeye
Copy link
Contributor Author

izeye commented May 27, 2021

@philwebb You're welcome 😄

By the way, the test added in 3f858ed seems to be a duplicate of runWhenOptionalWildcardLocationHasNoSubdirectoriesDoesNotThrow().

@izeye izeye deleted the missing-negation branch May 27, 2021 04:40
@philwebb
Copy link
Member

🤦

@philwebb
Copy link
Member

I've now removed the test. Thanks again!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
type: task A general task
Projects
None yet
Milestone
2.4.7
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@izeye @philwebb @spring-projects-issues