GH-3888: Fix NPE in the RedisLockRegistry.destroy()
#3889
Merged
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
Fixed spring-projects#3888 When `RedisLockType.SPIN_LOCK` (default), the `RedisLockRegistry.destroy()` causes an NPE on the `redisMessageListenerContainer` since pub-sub is not used in a busy-spin mode * Check for `redisMessageListenerContainer` before calling its `destroy()` **Cherry-pick to 5.5.x**
garyrussell
reviewed
Sep 20, 2022
...ration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java
Show resolved
Hide resolved
garyrussell
pushed a commit
that referenced
this pull request
Sep 20, 2022
* GH-3888: Fix NPE in the `RedisLockRegistry.destroy()` Fixed #3888 When `RedisLockType.SPIN_LOCK` (default), the `RedisLockRegistry.destroy()` causes an NPE on the `redisMessageListenerContainer` since pub-sub is not used in a busy-spin mode * Check for `redisMessageListenerContainer` before calling its `destroy()` **Cherry-pick to 5.5.x** * * Reset properties in the `RedisLockRegistry` after `destroy()`
|
...and cherry-picked, resolving conflicts in tests. |
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.
Fixed #3888
When
RedisLockType.SPIN_LOCK(default), theRedisLockRegistry.destroy()causes an NPE on theredisMessageListenerContainersince pub-sub is not used in a busy-spin moderedisMessageListenerContainerbefore calling itsdestroy()Cherry-pick to 5.5.x