aboutsummaryrefslogtreecommitdiffstats
path: root/container-core/src/main/java/com/yahoo/container/core
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-08-31 14:11:09 +0200
committergjoranv <gv@verizonmedia.com>2022-08-31 14:11:09 +0200
commitc5d3f1d34c8dc637cc3cc38a8d3a246d3f32ce66 (patch)
treea04cc15ed71906e8e79dc99174e0e4d43d3125bf /container-core/src/main/java/com/yahoo/container/core
parent581adfacdb511725ae4867dc83b3d2987e7f7347 (diff)
Revert "Set duplicate bundles to the set of bundles from the failed generation."
This reverts commit f68b1f92937d495ce968d07ae7e7212b0e3cce47.
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/core')
-rw-r--r--container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java
index 1e30b19a48d..972d6677e3b 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java
@@ -71,10 +71,8 @@ public class ApplicationBundleLoader {
bundlesFromNewGeneration.forEach(reference2Bundle::remove);
Collection<Bundle> ret = bundlesFromNewGeneration.values();
- // For correct operation of the CollisionHook (more specifically its FindHook implementation), the set of
- // allowed duplicates must reflect the next set of bundles to uninstall, which is now the bundles from the
- // failed generation.
- osgi.allowDuplicateBundles(ret);
+ // No duplicate bundles should be allowed until the next call to useBundles.
+ osgi.allowDuplicateBundles(Set.of());
// Clear restore info in case this method is called multiple times, for some reason.
bundlesFromNewGeneration = Map.of();