From a80b63f0f65b5d44444b4c47ee7803808b0fe8c6 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Thu, 1 Sep 2022 08:44:48 +0200 Subject: Reapply "Set duplicate bundles to the set of bundles from the failed generation." This reverts commit c5d3f1d34c8dc637cc3cc38a8d3a246d3f32ce66. --- .../com/yahoo/container/core/config/ApplicationBundleLoader.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'container-core/src/main/java/com/yahoo/container/core') 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 972d6677e3b..1e30b19a48d 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,8 +71,10 @@ public class ApplicationBundleLoader { bundlesFromNewGeneration.forEach(reference2Bundle::remove); Collection ret = bundlesFromNewGeneration.values(); - // No duplicate bundles should be allowed until the next call to useBundles. - osgi.allowDuplicateBundles(Set.of()); + // 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); // Clear restore info in case this method is called multiple times, for some reason. bundlesFromNewGeneration = Map.of(); -- cgit v1.2.3