GH-9401: RedisLockRegistry: use lock() instead of tryLock() for lifecycle

alexpeelman · spring-builds · commit 674ed7c228a5 · 2024-08-20T16:09:07.000Z
Fixes: #9401 Switched `tryLock()` with `lock()` in `RedisLockRegistry.runRedisMessageListenerContainer()` method for correct synchronization. (cherry picked from commit 07085a1)
diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java
@@ -86,6 +86,7 @@
  * @author Eddie Cho
  * @author Myeonghyeon Lee
  * @author Roman Zabaluev
+ * @author Alex Peelman
  *
  * @since 4.0
  *
@@ -658,7 +659,7 @@ private boolean subscribeLock(long time) throws ExecutionException, InterruptedE
 		}
 
 		private void runRedisMessageListenerContainer() {
-			RedisLockRegistry.this.lock.tryLock();
+			RedisLockRegistry.this.lock.lock();
 			try {
 				if (!(RedisLockRegistry.this.isRunningRedisMessageListenerContainer
 						&& RedisLockRegistry.this.redisMessageListenerContainer != null

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@`
`86`	`86`	`* @author Eddie Cho`
`87`	`87`	`* @author Myeonghyeon Lee`
`88`	`88`	`* @author Roman Zabaluev`
	`89`	`+ * @author Alex Peelman`
`89`	`90`	`*`
`90`	`91`	`* @since 4.0`
`91`	`92`	`*`
`@@ -658,7 +659,7 @@ private boolean subscribeLock(long time) throws ExecutionException, InterruptedE`
`658`	`659`	`}`
`659`	`660`
`660`	`661`	`private void runRedisMessageListenerContainer() {`
`661`		`- RedisLockRegistry.this.lock.tryLock();`
	`662`	`+ RedisLockRegistry.this.lock.lock();`
`662`	`663`	`try {`
`663`	`664`	`if (!(RedisLockRegistry.this.isRunningRedisMessageListenerContainer`
`664`	`665`	`&& RedisLockRegistry.this.redisMessageListenerContainer != null`