This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 4fecfd7d9e95525755943a76455c7d3a4f60f4a1 Author: Michael Osipov <[email protected]> AuthorDate: Sun Aug 29 00:19:12 2021 +0200 [MRESOLVER-193] Properly type lock key names in Redis --- .../aether/named/redisson/RedissonReadWriteLockNamedLockFactory.java | 4 +++- .../aether/named/redisson/RedissonSemaphoreNamedLockFactory.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonReadWriteLockNamedLockFactory.java b/maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonReadWriteLockNamedLockFactory.java index 647f775..30b7a93 100644 --- a/maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonReadWriteLockNamedLockFactory.java +++ b/maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonReadWriteLockNamedLockFactory.java @@ -35,10 +35,12 @@ public class RedissonReadWriteLockNamedLockFactory { public static final String NAME = "rwlock-redisson"; + private static final String TYPED_NAME_PREFIX = NAME_PREFIX + NAME + ":"; + @Override protected ReadWriteLockNamedLock createLock( final String name ) { - RReadWriteLock readWriteLock = redissonClient.getReadWriteLock( NAME_PREFIX + name ); + RReadWriteLock readWriteLock = redissonClient.getReadWriteLock( TYPED_NAME_PREFIX + name ); return new ReadWriteLockNamedLock( name, this, readWriteLock ); } } diff --git a/maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonSemaphoreNamedLockFactory.java b/maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonSemaphoreNamedLockFactory.java index 8d393ae..e883218 100644 --- a/maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonSemaphoreNamedLockFactory.java +++ b/maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonSemaphoreNamedLockFactory.java @@ -38,6 +38,8 @@ public class RedissonSemaphoreNamedLockFactory { public static final String NAME = "semaphore-redisson"; + private static final String TYPED_NAME_PREFIX = NAME_PREFIX + NAME + ":"; + private final ConcurrentMap<String, RSemaphore> semaphores; public RedissonSemaphoreNamedLockFactory() @@ -50,7 +52,7 @@ public class RedissonSemaphoreNamedLockFactory { RSemaphore semaphore = semaphores.computeIfAbsent( name, k -> { - RSemaphore result = redissonClient.getSemaphore( NAME_PREFIX + k ); + RSemaphore result = redissonClient.getSemaphore( TYPED_NAME_PREFIX + k ); result.trySetPermits( Integer.MAX_VALUE ); return result; } );
