From eb82e2768977558b68ea2469fdb8c1c793e3b8ae Mon Sep 17 00:00:00 2001 From: gjoranv Date: Thu, 31 Oct 2019 13:33:39 +0100 Subject: Avoid excessive logging when no bundles are hidden. --- .../java/com/yahoo/jdisc/core/BundleCollisionHook.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'jdisc_core/src') 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 ae1c81195ce..8a038b79bde 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 @@ -8,6 +8,7 @@ import org.osgi.framework.Version; import org.osgi.framework.hooks.bundle.CollisionHook; import org.osgi.framework.hooks.bundle.EventHook; import org.osgi.framework.hooks.bundle.FindHook; +import org.osgi.framework.launch.Framework; import java.util.Collection; import java.util.HashMap; @@ -107,7 +108,7 @@ public class BundleCollisionHook implements CollisionHook, EventHook, FindHook { } } } - log.info("Hiding bundles from bundle '" + context.getBundle() + "': " + bundlesToHide); + logHiddenBundles(context, bundlesToHide); bundles.removeAll(bundlesToHide); } @@ -115,6 +116,18 @@ public class BundleCollisionHook implements CollisionHook, EventHook, FindHook { return ! allowedDuplicates.containsKey(bundle) && allowedDuplicates.containsValue(new BsnVersion(bundle)); } + private void logHiddenBundles(BundleContext requestingContext, Set hiddenBundles) { + if (hiddenBundles.isEmpty()) { + log.fine(() -> "No bundles to hide from bundle " + requestingContext.getBundle()); + } else { + if (requestingContext.getBundle() instanceof Framework) { + log.fine(() -> "Requesting bundle is the Framework, so hidden bundles will be visible: " + hiddenBundles); + } else { + log.info("Hiding bundles from bundle '" + requestingContext.getBundle() + "': " + hiddenBundles); + } + } + } + static class BsnVersion { -- cgit v1.2.3