GH-8745: Add RFT.shouldMarkSessionAsDirty() #8759
Merged
Conversation
This file contains 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#8745 Not all errors caught in the `RemoteFileTemplate.execute()` are fatal to mark session as dirty and physically close the target session in the cache * Introduce a `RemoteFileTemplate.shouldMarkSessionAsDirty()` to consult with an exception if it is really a fatal error to close the session in the end. * Override `shouldMarkSessionAsDirty()` in the `RemoteFileTemplate` implementations to check statuses of respective protocol errors **Cherry-pick to `6.1.x` & `6.0.x`**
garyrussell
suggested changes
Oct 11, 2023
...ation-file/src/main/java/org/springframework/integration/file/remote/RemoteFileTemplate.java
Outdated
Show resolved
Hide resolved
...ation-file/src/main/java/org/springframework/integration/file/remote/RemoteFileTemplate.java
Outdated
Show resolved
Hide resolved
...ation-file/src/main/java/org/springframework/integration/file/remote/RemoteFileTemplate.java
Show resolved
Hide resolved
...ation-file/src/main/java/org/springframework/integration/file/remote/RemoteFileTemplate.java
Show resolved
Hide resolved
...ion-ftp/src/main/java/org/springframework/integration/ftp/session/FtpRemoteFileTemplate.java
Show resolved
Hide resolved
...-sftp/src/main/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplate.java
Outdated
Show resolved
Hide resolved
* Add more `not dirty` statuses to `SftpRemoteFileTemplate` & `SmbRemoteFileTemplate`
garyrussell
approved these changes
Oct 11, 2023
garyrussell
pushed a commit
that referenced
this pull request
Oct 11, 2023
* GH-8745: Add RFT.shouldMarkSessionAsDirty() Fixes #8745 Not all errors caught in the `RemoteFileTemplate.execute()` are fatal to mark session as dirty and physically close the target session in the cache * Introduce a `RemoteFileTemplate.shouldMarkSessionAsDirty()` to consult with an exception if it is really a fatal error to close the session in the end. * Override `shouldMarkSessionAsDirty()` in the `RemoteFileTemplate` implementations to check statuses of respective protocol errors **Cherry-pick to `6.1.x` & `6.0.x`** * * Fix tests for pool interaction * * Fix language in Javadocs * Add more `not dirty` statuses to `SftpRemoteFileTemplate` & `SmbRemoteFileTemplate`
garyrussell
pushed a commit
that referenced
this pull request
Oct 11, 2023
* GH-8745: Add RFT.shouldMarkSessionAsDirty() Fixes #8745 Not all errors caught in the `RemoteFileTemplate.execute()` are fatal to mark session as dirty and physically close the target session in the cache * Introduce a `RemoteFileTemplate.shouldMarkSessionAsDirty()` to consult with an exception if it is really a fatal error to close the session in the end. * Override `shouldMarkSessionAsDirty()` in the `RemoteFileTemplate` implementations to check statuses of respective protocol errors **Cherry-pick to `6.1.x` & `6.0.x`** * * Fix tests for pool interaction * * Fix language in Javadocs * Add more `not dirty` statuses to `SftpRemoteFileTemplate` & `SmbRemoteFileTemplate`
|
...and cherry-picked after resolving minor conflicts. |
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 #8745
Not all errors caught in the
RemoteFileTemplate.execute()are fatal to mark session as dirty and physically close the target session in the cacheRemoteFileTemplate.shouldMarkSessionAsDirty()to consult with an exception if it is really a fatal error to close the session in the end.shouldMarkSessionAsDirty()in theRemoteFileTemplateimplementations to check statuses of respective protocol errorsCherry-pick to
6.1.x&6.0.x