This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 032d61ae6 Let the IPC named lock box an exclusive lock through a
shared step (#2298)
032d61ae6 is described below
commit 032d61ae60e1a5b0fe6857bd76a99aafb0ec2a1b
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Mon Nov 16 20:41:02 2026 +0100
Let the IPC named lock box an exclusive lock through a shared step (#2298)
Only a shared-only stack is an upgrade; the file, read-write and semaphore
based locks already allow exclusive > shared > exclusive.
---
.../java/org/eclipse/aether/named/ipc/IpcNamedLock.java | 8 +++++---
.../aether/named/ipc/NamedLockFactoryTestSupport.java | 14 ++++++++++++++
.../eclipse/aether/named/NamedLockFactoryTestSupport.java | 14 ++++++++++++++
3 files changed, 33 insertions(+), 3 deletions(-)
diff --git
a/maven-resolver-named-locks-ipc/src/main/java/org/eclipse/aether/named/ipc/IpcNamedLock.java
b/maven-resolver-named-locks-ipc/src/main/java/org/eclipse/aether/named/ipc/IpcNamedLock.java
index 28f28fae0..129bfaefd 100644
---
a/maven-resolver-named-locks-ipc/src/main/java/org/eclipse/aether/named/ipc/IpcNamedLock.java
+++
b/maven-resolver-named-locks-ipc/src/main/java/org/eclipse/aether/named/ipc/IpcNamedLock.java
@@ -71,10 +71,12 @@ class IpcNamedLock extends NamedLockSupport {
@Override
public boolean doLockExclusively(long time, TimeUnit unit) {
ArrayDeque<Ctx> contexts = this.contexts.get();
- if (contexts.stream().anyMatch(c -> c.shared)) {
- throw new LockUpgradeNotSupportedException(this);
- }
if (!contexts.isEmpty()) {
+ // boxing: the outermost context already holds the server-side
lock; only a shared-only stack is an
+ // upgrade, as in the other named lock implementations
+ if (contexts.stream().allMatch(c -> c.shared)) {
+ throw new LockUpgradeNotSupportedException(this);
+ }
contexts.push(new Ctx(false, null, false));
return true;
}
diff --git
a/maven-resolver-named-locks-ipc/src/test/java/org/eclipse/aether/named/ipc/NamedLockFactoryTestSupport.java
b/maven-resolver-named-locks-ipc/src/test/java/org/eclipse/aether/named/ipc/NamedLockFactoryTestSupport.java
index dab659d37..7c7b86086 100644
---
a/maven-resolver-named-locks-ipc/src/test/java/org/eclipse/aether/named/ipc/NamedLockFactoryTestSupport.java
+++
b/maven-resolver-named-locks-ipc/src/test/java/org/eclipse/aether/named/ipc/NamedLockFactoryTestSupport.java
@@ -106,6 +106,20 @@ public abstract class NamedLockFactoryTestSupport {
}
}
+ @Test
+ void wrwBoxing(TestInfo testInfo) throws InterruptedException {
+ final Collection<NamedLockKey> keys =
Collections.singleton(NamedLockKey.of(testInfo.getDisplayName()));
+ try (NamedLock one = namedLockFactory.getLock(keys)) {
+ assertTrue(one.lockExclusively(100L, TimeUnit.MILLISECONDS));
+ assertTrue(one.lockShared(100L, TimeUnit.MILLISECONDS));
+ // the exclusive lock is still held, so this is boxing, not an
upgrade
+ assertTrue(one.lockExclusively(100L, TimeUnit.MILLISECONDS));
+ one.unlock();
+ one.unlock();
+ one.unlock();
+ }
+ }
+
@Test
void rwBoxing(TestInfo testInfo) throws InterruptedException {
final Collection<NamedLockKey> keys =
Collections.singleton(NamedLockKey.of(testInfo.getDisplayName()));
diff --git
a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/NamedLockFactoryTestSupport.java
b/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/NamedLockFactoryTestSupport.java
index f57e86829..fcc6fc65f 100644
---
a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/NamedLockFactoryTestSupport.java
+++
b/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/NamedLockFactoryTestSupport.java
@@ -129,6 +129,20 @@ public abstract class NamedLockFactoryTestSupport {
}
}
+ @Test
+ void wrwBoxing(TestInfo testInfo) throws InterruptedException {
+ final Collection<NamedLockKey> keys = lockName(testInfo);
+ try (NamedLock one = namedLockFactory.getLock(keys)) {
+ assertTrue(one.lockExclusively(1L, TimeUnit.MILLISECONDS));
+ assertTrue(one.lockShared(1L, TimeUnit.MILLISECONDS));
+ // the exclusive lock is still held, so this is boxing, not an
upgrade
+ assertTrue(one.lockExclusively(1L, TimeUnit.MILLISECONDS));
+ one.unlock();
+ one.unlock();
+ one.unlock();
+ }
+ }
+
@Test
void rwBoxing(TestInfo testInfo) throws InterruptedException {
final Collection<NamedLockKey> keys = lockName(testInfo);