aboutsummaryrefslogtreecommitdiffstats
path: root/container-di/src/test/java/com/yahoo
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2020-12-08 01:22:19 +0100
committerGitHub <noreply@github.com>2020-12-08 01:22:19 +0100
commit96cf054bba808ff36e80cf939fadbc358b5ed7aa (patch)
tree3945720b9de8d56e84e49810c80356fa19771617 /container-di/src/test/java/com/yahoo
parent82d1a71afff67b0004291be4091d8a00d0dfa79e (diff)
parented28b553908170648a2a5467d478d7830057a5b8 (diff)
Merge pull request #15731 from vespa-engine/revert-15724-revert-15723-revert-15715-jonmv/deconstruct-in-order
Revert "Revert "Revert "Always deconstruct in reverse creation order, including Provider objects"""
Diffstat (limited to 'container-di/src/test/java/com/yahoo')
-rw-r--r--container-di/src/test/java/com/yahoo/container/di/ContainerTest.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java b/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java
index d39e8a36aed..19f277ff8fb 100644
--- a/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java
+++ b/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java
@@ -19,7 +19,6 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import java.util.Collection;
-import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -381,7 +380,7 @@ public class ContainerTest extends ContainerTestBase {
public static class TestDeconstructor implements ComponentDeconstructor {
@Override
- public void deconstruct(List<Object> components, Collection<Bundle> bundles) {
+ public void deconstruct(Collection<Object> components, Collection<Bundle> bundles) {
components.forEach(component -> {
if (component instanceof DestructableComponent) {
DestructableComponent vespaComponent = (DestructableComponent) component;