aboutsummaryrefslogtreecommitdiffstats
path: root/jdisc_core
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2019-10-29 11:47:30 +0100
committergjoranv <gv@verizonmedia.com>2019-10-29 13:44:16 +0100
commit205861992d4d65435c3afafac515cb3fda615585 (patch)
tree85fb2c046a75ed8357b9eee49d2a22d3fc8646ca /jdisc_core
parentfb652e337235245740602a6c586a668e98f68993 (diff)
Add debug logging
Diffstat (limited to 'jdisc_core')
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java3
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java6
2 files changed, 8 insertions, 1 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);
}
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java
index eb829d3b273..c14e513fb98 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java
@@ -158,7 +158,11 @@ public class FelixFramework implements OsgiFramework {
@Override
public List<Bundle> getBundles(Bundle requestingBundle) {
- return Arrays.asList(requestingBundle.getBundleContext().getBundles());
+ log.fine(() -> "All bundles: " + bundles());
+ log.fine(() -> "Getting visible bundles for bundle " + requestingBundle);
+ List<Bundle> visibleBundles = Arrays.asList(requestingBundle.getBundleContext().getBundles());
+ log.fine(() -> "Visible bundles: " + visibleBundles);
+ return visibleBundles;
}
public void allowDuplicateBundles(Collection<Bundle> bundles) {