Skip to content

Clear lock cache in NioFileLocker #2998

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

Merged
merged 1 commit into from
Jul 22, 2019

Conversation

garyrussell
Copy link
Contributor

Fixes #2980

cherry-pick to all supported (except diamonds in 4.3.x)

@artembilan artembilan merged commit 8bb0e19 into spring-projects:master Jul 22, 2019
artembilan pushed a commit that referenced this pull request Jul 22, 2019
Fixes #2980
# Conflicts:
#	spring-integration-file/src/test/java/org/springframework/integration/file/locking/NioFileLockerTests.java
artembilan pushed a commit that referenced this pull request Jul 22, 2019
Fixes #2980
# Conflicts:
#	spring-integration-file/src/test/java/org/springframework/integration/file/locking/NioFileLockerTests.java
artembilan pushed a commit that referenced this pull request Jul 22, 2019
Fixes #2980
# Conflicts:
#	spring-integration-file/src/test/java/org/springframework/integration/file/locking/NioFileLockerTests.java

# Conflicts:
#	spring-integration-file/src/main/java/org/springframework/integration/file/locking/NioFileLocker.java
#	spring-integration-file/src/test/java/org/springframework/integration/file/locking/NioFileLockerTests.java
@artembilan
Copy link
Member

... and cherry-picked into 5.1.x & 5.0.x as 1e38ff7 after resolving AssertJ conflicts in tests.
Into 4.3.x as f2bd8c4 after more conflicts and restoring diamonds change.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

NioFileLocker.unlock
2 participants