GH-10372: Fix the ignoring logic for tmp files #10373
Merged
+13
−16
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
Fixes: spring-projects#10372 The `AbstractInboundFileSynchronizingMessageSource` uses a `CompositeFileListFilter` for a combination of the user-provided filter and then the one to ignore temporary files. However, the `CompositeFileListFilter` logic is `OR`, which means the temporary file might be accepted by the user-provided. * Fix the `AbstractInboundFileSynchronizingMessageSource.buildFilter()` to use a `ChainFileListFilter` instead (with an `AND` logic), and put `ignoreTemporaryFiles` filter as the first one. * Fix (S)FTP docs for an actual logic regarding local files filtering. **Cherry-pick to `6.5.x`**
|
NOTE: It won't cherry-pick clean since there is no proper Nullability. Thanks |
cppwfs
approved these changes
Sep 3, 2025
cppwfs
pushed a commit
to cppwfs/spring-integration
that referenced
this pull request
Sep 3, 2025
…-projects#10373) Fixes: spring-projects#10372 The `AbstractInboundFileSynchronizingMessageSource` uses a `CompositeFileListFilter` for a combination of the user-provided filter and then the one to ignore temporary files. However, the `CompositeFileListFilter` logic is `OR`, which means the temporary file might be accepted by the user-provided. * Fix the `AbstractInboundFileSynchronizingMessageSource.buildFilter()` to use a `ChainFileListFilter` instead (with an `AND` logic), and put `ignoreTemporaryFiles` filter as the first one. * Fix (S)FTP docs for an actual logic regarding local files filtering. **Cherry-pick to `6.5.x`**
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.
Fixes: #10372
The
AbstractInboundFileSynchronizingMessageSourceuses aCompositeFileListFilterfor a combination of the user-provided filter and then the one to ignore temporary files. However, theCompositeFileListFilterlogic isOR, which means the temporary file might be accepted by the user-provided.AbstractInboundFileSynchronizingMessageSource.buildFilter()to use aChainFileListFilterinstead (with anANDlogic), and putignoreTemporaryFilesfilter as the first one.Cherry-pick to
6.5.x