This is an automated email from the ASF dual-hosted git repository.
slachiewicz 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 b5adf084f Restore the interrupt status when dependency collection is
interrupted
b5adf084f is described below
commit b5adf084f33223ba73fc21464ab8b4be29d541da
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sun Nov 8 23:26:17 2026 +0100
Restore the interrupt status when dependency collection is interrupted
Thread.interrupted() clears the flag when the collectors detect the
interrupt;
nothing restored it before the DependencyCollectionException was thrown.
---
.../internal/impl/collect/bf/BfDependencyCollector.java | 2 ++
.../internal/impl/collect/df/DfDependencyCollector.java | 2 ++
.../collect/DependencyCollectorDelegateTestSupport.java | 14 ++++++++++++++
3 files changed, 18 insertions(+)
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java
index 48e1a483b..fbd2461d6 100644
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java
+++
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java
@@ -224,6 +224,8 @@ public class BfDependencyCollector extends
DependencyCollectorDelegate {
}
if (args.interruptedException.get() != null) {
+ // Thread.interrupted() cleared the flag when the interrupt
was detected; restore it for the caller
+ Thread.currentThread().interrupt();
throw new DependencyCollectionException(
results.getResult(), "Collection interrupted",
args.interruptedException.get());
}
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollector.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollector.java
index a3037c6c7..9c5c81f2d 100644
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollector.java
+++
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollector.java
@@ -117,6 +117,8 @@ public class DfDependencyCollector extends
DependencyCollectorDelegate {
session.getVersionFilter() != null ?
session.getVersionFilter().deriveChildFilter(context) : null);
if (args.interruptedException.get() != null) {
+ // Thread.interrupted() cleared the flag when the interrupt was
detected; restore it for the caller
+ Thread.currentThread().interrupt();
throw new DependencyCollectionException(
results.getResult(), "Collection interrupted",
args.interruptedException.get());
}
diff --git
a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegateTestSupport.java
b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegateTestSupport.java
index ff52c3f43..0bb3e2f6a 100644
---
a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegateTestSupport.java
+++
b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegateTestSupport.java
@@ -190,6 +190,20 @@ public abstract class
DependencyCollectorDelegateTestSupport {
assertEquals(expect, root.getChildren().get(0).getDependency());
}
+ @Test
+ void testCollectionInterrupted() {
+ CollectRequest request = new CollectRequest(newDep("gid:aid:ext:ver",
"compile"), singletonList(repository));
+ Thread.currentThread().interrupt();
+ try {
+ DependencyCollectionException e = assertThrows(
+ DependencyCollectionException.class, () ->
collector.collectDependencies(session, request));
+ assertInstanceOf(InterruptedException.class, e.getCause());
+ assertTrue(Thread.currentThread().isInterrupted(), "the interrupt
status is restored for the caller");
+ } finally {
+ Thread.interrupted(); // clear it, so that it does not leak into
the next test
+ }
+ }
+
@Test
void testMissingDependencyDescription() {
CollectRequest request = new
CollectRequest(newDep("missing:description:ext:ver"),
singletonList(repository));