Reapply "Set duplicate bundles to the set of bundles from the failed generation."

This reverts commit c5d3f1d34c8dc637cc3cc38a8d3a246d3f32ce66.

1 files changed, 4 insertions, 2 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 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<Bundle> 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();