aboutsummaryrefslogtreecommitdiffstats
path: root/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2019-11-05 10:53:44 +0100
committergjoranv <gv@verizonmedia.com>2019-11-05 10:53:44 +0100
commitd75825d503b8566e66d45b0ef726a1d5834970d7 (patch)
treed6da7f8af45a6bef83823f1ae7068317a5d17e8d /jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java
parent73cbfef0434123f59584f9ed5f5cceac6715adbd (diff)
Reapply "Gjoranv/allow duplicate bundles"
This reverts commit 2ef1e922a1d845b3cd79e9fb329925e7e9896919.
Diffstat (limited to 'jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java')
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java
index 58ad5df9b0d..ae1c81195ce 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java
@@ -15,6 +15,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import java.util.logging.Logger;
/**
* A bundle {@link CollisionHook} that contains a set of bundles that are allowed to collide with
@@ -26,6 +27,7 @@ import java.util.Set;
* @author gjoranv
*/
public class BundleCollisionHook implements CollisionHook, EventHook, FindHook {
+ private static Logger log = Logger.getLogger(BundleCollisionHook.class.getName());
private ServiceRegistration<?> registration;
private Map<Bundle, BsnVersion> allowedDuplicates = new HashMap<>(5);
@@ -105,6 +107,7 @@ public class BundleCollisionHook implements CollisionHook, EventHook, FindHook {
}
}
}
+ log.info("Hiding bundles from bundle '" + context.getBundle() + "': " + bundlesToHide);
bundles.removeAll(bundlesToHide);
}